mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Programs: Prepare accept/reject zones

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-12-14 19:20:15 +03:00
parent 6d74ba5049
commit b66611e4ae
9 changed files with 70 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/3rdparty/sqlite/sqlitestmt.cpp vendored
View File

@ -224,6 +224,11 @@ qint32 SqliteStmt::columnInt(int column) const
return sqlite3_column_int(m_stmt, column);
}
quint32 SqliteStmt::columnUInt(int column) const
{
return quint32(columnInt(column));
}
qint64 SqliteStmt::columnInt64(int column) const
{
return sqlite3_column_int64(m_stmt, column);

1
src/ui/3rdparty/sqlite/sqlitestmt.h vendored
View File

@ -60,6 +60,7 @@ public:
QString columnName(int column = 0) const;
qint32 columnInt(int column = 0) const;
quint32 columnUInt(int column = 0) const;
qint64 columnInt64(int column = 0) const;
double columnDouble(int column = 0) const;
bool columnBool(int column = 0) const;

9
src/ui/conf/app.cpp
View File

@ -11,6 +11,11 @@ bool App::isBaseFlagsEqual(const App &o) const
&& applyChild == o.applyChild && killChild == o.killChild && lanOnly == o.lanOnly;
}
bool App::isZonesEqual(const App &o) const
{
return acceptZones == o.acceptZones && rejectZones == o.rejectZones;
}
bool App::isExtraFlagsEqual(const App &o) const
{
return logBlocked == o.logBlocked && logConn == o.logConn && blocked == o.blocked
@ -19,8 +24,8 @@ bool App::isExtraFlagsEqual(const App &o) const
bool App::isOptionsEqual(const App &o) const
{
return isFlagsEqual(o) && groupIndex == o.groupIndex && appOriginPath == o.appOriginPath
&& appPath == o.appPath && endTime == o.endTime;
return isFlagsEqual(o) && isZonesEqual(o) && groupIndex == o.groupIndex
&& appOriginPath == o.appOriginPath && appPath == o.appPath && endTime == o.endTime;
}
bool App::isNameEqual(const App &o) const

4
src/ui/conf/app.h
View File

@ -10,6 +10,7 @@ public:
bool isFlagsEqual(const App &o) const;
bool isBaseFlagsEqual(const App &o) const;
bool isExtraFlagsEqual(const App &o) const;
bool isZonesEqual(const App &o) const;
bool isOptionsEqual(const App &o) const;
bool isNameEqual(const App &o) const;
@ -29,6 +30,9 @@ public:
int groupIndex = 0;
quint32 acceptZones = 0;
quint32 rejectZones = 0;
qint64 appId = 0;
QString appOriginPath;

40
src/ui/conf/confmanager.cpp
View File

@ -37,7 +37,7 @@ namespace {
const QLoggingCategory LC("conf");
constexpr int DATABASE_USER_VERSION = 26;
constexpr int DATABASE_USER_VERSION = 27;
constexpr int APP_END_TIMER_INTERVAL_MIN = 100;
constexpr int APP_END_TIMER_INTERVAL_MAX = 24 * 60 * 60 * 1000; // 1 day
@ -127,6 +127,8 @@ const char *const sqlSelectAppPaths = "SELECT app_id, path FROM app;";
" t.log_conn," \
" t.blocked," \
" t.kill_process," \
" t.accept_zones," \
" t.reject_zones," \
" g.order_index as group_index," \
" (alert.app_id IS NOT NULL) as alerted"
@ -152,15 +154,16 @@ const char *const sqlSelectAppIdByPath = "SELECT app_id FROM app WHERE path = ?1
const char *const sqlUpsertApp = "INSERT INTO app(app_group_id, origin_path, path, name,"
" is_wildcard, use_group_perm, apply_child, kill_child,"
" lan_only, log_blocked, log_conn, blocked, kill_process,"
" end_time, creat_time)"
" accept_zones, reject_zones, end_time, creat_time)"
" VALUES(?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9,"
" ?10, ?11, ?12, ?13, ?14, ?15)"
" ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)"
" ON CONFLICT(path) DO UPDATE"
" SET app_group_id = ?1, origin_path = ?2, name = ?4,"
" is_wildcard = ?5, use_group_perm = ?6,"
" apply_child = ?7, kill_child = ?8,"
" lan_only = ?9, log_blocked = ?10, log_conn = ?11,"
" blocked = ?12, kill_process = ?13, end_time = ?14"
" blocked = ?12, kill_process = ?13,"
" accept_zones = ?14, reject_zones = ?15, end_time = ?16"
" RETURNING app_id;";
const char *const sqlInsertAppAlert = "INSERT INTO app_alert(app_id) VALUES(?1);";
@ -174,7 +177,8 @@ const char *const sqlUpdateApp = "UPDATE app"
" name = ?5, is_wildcard = ?6, use_group_perm = ?7,"
" apply_child = ?8, kill_child = ?9, lan_only = ?10,"
" log_blocked = ?11, log_conn = ?12,"
" blocked = ?13, kill_process = ?14, end_time = ?15"
" blocked = ?13, kill_process = ?14,"
" accept_zones = ?15, reject_zones = ?16, end_time = ?17"
" WHERE app_id = ?1;";
const char *const sqlUpdateAppName = "UPDATE app SET name = ?2 WHERE app_id = ?1;";
@ -199,6 +203,10 @@ const char *const sqlDeleteAddressGroupZone = "UPDATE address_group"
" SET include_zones = include_zones & ?1,"
" exclude_zones = exclude_zones & ?1;";
const char *const sqlDeleteAppZone = "UPDATE app"
" SET accept_zones = accept_zones & ?1,"
" reject_zones = reject_zones & ?1;";
const char *const sqlUpdateZone = "UPDATE zone"
" SET name = ?2, enabled = ?3, custom_url = ?4,"
" source_code = ?5, url = ?6,"
@ -340,8 +348,8 @@ bool loadAddressGroups(SqliteDb *db, const QList<AddressGroup *> &addressGroups,
addrGroup->setId(stmt.columnInt64(0));
addrGroup->setIncludeAll(stmt.columnBool(1));
addrGroup->setExcludeAll(stmt.columnBool(2));
addrGroup->setIncludeZones(quint32(stmt.columnInt64(3)));
addrGroup->setExcludeZones(quint32(stmt.columnInt64(4)));
addrGroup->setIncludeZones(stmt.columnUInt(3));
addrGroup->setExcludeZones(stmt.columnUInt(4));
addrGroup->setIncludeText(stmt.columnText(5));
addrGroup->setExcludeText(stmt.columnText(6));
@ -979,8 +987,8 @@ bool ConfManager::updateApp(const App &app)
const auto vars = QVariantList()
<< app.appId << appGroup->id() << app.appOriginPath << app.appPath << app.appName
<< app.isWildcard << app.useGroupPerm << app.applyChild << app.killChild << app.lanOnly
<< app.logBlocked << app.logConn << app.blocked << app.killProcess
<< (!app.endTime.isNull() ? app.endTime : QVariant());
<< app.logBlocked << app.logConn << app.blocked << app.killProcess << app.acceptZones
<< app.rejectZones << (!app.endTime.isNull() ? app.endTime : QVariant());
sqliteDb()->executeEx(sqlUpdateApp, vars, 0, &ok);
@ -1177,9 +1185,13 @@ bool ConfManager::deleteZone(int zoneId)
sqliteDb()->executeEx(sqlDeleteZone, { zoneId }, 0, &ok);
if (ok) {
// Delete the Zone from Address Groups
const quint32 zoneUnMask = ~(quint32(1) << (zoneId - 1));
// Delete the Zone from Address Groups
sqliteDb()->executeEx(sqlDeleteAddressGroupZone, { qint64(zoneUnMask) }, 0, &ok);
// Delete the Zone from Programs
sqliteDb()->executeEx(sqlDeleteAppZone, { qint64(zoneUnMask) }, 0, &ok);
}
commitTransaction(ok);
@ -1374,7 +1386,7 @@ bool ConfManager::addOrUpdateApp(const App &app)
const auto vars = QVariantList()
<< appGroup->id() << app.appOriginPath << app.appPath << app.appName << app.isWildcard
<< app.useGroupPerm << app.applyChild << app.killChild << app.lanOnly << app.logBlocked
<< app.logConn << app.blocked << app.killProcess
<< app.logConn << app.blocked << app.killProcess << app.acceptZones << app.rejectZones
<< (!app.endTime.isNull() ? app.endTime : QVariant()) << QDateTime::currentDateTime();
const auto appIdVar = sqliteDb()->executeEx(sqlUpsertApp, vars, 1, &ok);
@ -1427,8 +1439,10 @@ void ConfManager::fillApp(App &app, const SqliteStmt &stmt)
app.logConn = stmt.columnBool(9);
app.blocked = stmt.columnBool(10);
app.killProcess = stmt.columnBool(11);
app.groupIndex = stmt.columnInt(12);
app.alerted = stmt.columnBool(13);
app.acceptZones = stmt.columnUInt(12);
app.rejectZones = stmt.columnUInt(13);
app.groupIndex = stmt.columnInt(14);
app.alerted = stmt.columnBool(15);
}
bool ConfManager::updateDriverDeleteApp(const QString &appPath)

2
src/ui/conf/migrations/1.sql
View File

@ -135,6 +135,8 @@ CREATE TABLE app(
log_conn BOOLEAN NOT NULL DEFAULT 1,
blocked BOOLEAN NOT NULL,
kill_process BOOLEAN NOT NULL DEFAULT 0,
accept_zones BOOLEAN NOT NULL DEFAULT 0, -- zone indexes bit mask
reject_zones BOOLEAN NOT NULL DEFAULT 0, -- zone indexes bit mask
creat_time INTEGER NOT NULL,
end_time INTEGER,
policy_id INTEGER

10
src/ui/model/applistmodel.cpp
View File

@ -328,9 +328,11 @@ bool AppListModel::updateAppRow(const QString &sql, const QVariantList &vars, Ap
appRow.logConn = stmt.columnBool(11);
appRow.blocked = stmt.columnBool(12);
appRow.killProcess = stmt.columnBool(13);
appRow.alerted = stmt.columnBool(14);
appRow.endTime = stmt.columnDateTime(15);
appRow.creatTime = stmt.columnDateTime(16);
appRow.acceptZones = stmt.columnBool(14);
appRow.rejectZones = stmt.columnBool(15);
appRow.alerted = stmt.columnBool(16);
appRow.endTime = stmt.columnDateTime(17);
appRow.creatTime = stmt.columnDateTime(18);
return true;
}
@ -394,6 +396,8 @@ QString AppListModel::sqlBase() const
" t.log_conn,"
" t.blocked,"
" t.kill_process,"
" t.accept_zones,"
" t.reject_zones,"
" (alert.app_id IS NOT NULL) as alerted,"
" t.end_time,"
" t.creat_time"

6
src/ui/rpc/confmanagerrpc.cpp
View File

@ -21,7 +21,8 @@ bool ConfManagerRpc::addApp(const App &app)
return IoC<RpcManager>()->doOnServer(Control::Rpc_ConfManager_addApp,
{ app.isWildcard, app.useGroupPerm, app.applyChild, app.killChild, app.lanOnly,
app.logBlocked, app.logConn, app.blocked, app.killProcess, app.groupIndex,
app.appOriginPath, app.appPath, app.appName, app.endTime });
app.acceptZones, app.rejectZones, app.appOriginPath, app.appPath, app.appName,
app.endTime });
}
void ConfManagerRpc::deleteApps(const QVector<qint64> &appIdList)
@ -44,7 +45,8 @@ bool ConfManagerRpc::updateApp(const App &app)
return IoC<RpcManager>()->doOnServer(Control::Rpc_ConfManager_updateApp,
{ app.isWildcard, app.useGroupPerm, app.applyChild, app.killChild, app.lanOnly,
app.logBlocked, app.logConn, app.blocked, app.killProcess, app.groupIndex,
app.appId, app.appOriginPath, app.appPath, app.appName, app.endTime });
app.acceptZones, app.rejectZones, app.appId, app.appOriginPath, app.appPath,
app.appName, app.endTime });
}
void ConfManagerRpc::updateAppsBlocked(

22
src/ui/rpc/rpcmanager.cpp
View File

@ -82,10 +82,12 @@ bool processConfManager_addApp(
app.blocked = p.args.value(7).toBool();
app.killProcess = p.args.value(8).toBool();
app.groupIndex = p.args.value(9).toInt();
app.appOriginPath = p.args.value(10).toString();
app.appPath = p.args.value(11).toString();
app.appName = p.args.value(12).toString();
app.endTime = p.args.value(13).toDateTime();
app.acceptZones = p.args.value(10).toUInt();
app.rejectZones = p.args.value(11).toUInt();
app.appOriginPath = p.args.value(12).toString();
app.appPath = p.args.value(13).toString();
app.appName = p.args.value(14).toString();
app.endTime = p.args.value(15).toDateTime();
return confManager->addApp(app);
}
@ -117,11 +119,13 @@ bool processConfManager_updateApp(
app.blocked = p.args.value(7).toBool();
app.killProcess = p.args.value(8).toBool();
app.groupIndex = p.args.value(9).toInt();
app.appId = p.args.value(10).toLongLong();
app.appOriginPath = p.args.value(11).toString();
app.appPath = p.args.value(12).toString();
app.appName = p.args.value(13).toString();
app.endTime = p.args.value(14).toDateTime();
app.acceptZones = p.args.value(10).toUInt();
app.rejectZones = p.args.value(11).toUInt();
app.appId = p.args.value(12).toLongLong();
app.appOriginPath = p.args.value(13).toString();
app.appPath = p.args.value(14).toString();
app.appName = p.args.value(15).toString();
app.endTime = p.args.value(16).toDateTime();
return confManager->updateApp(app);
}