Skip to content

Commit 906b225

Browse files
gustavo-iniguez-goyagustavo-iniguez-goya
committed
ui: display all fields in the details of a view
1 parent 2b3028e commit 906b225

File tree

1 file changed

+93
-60
lines changed

1 file changed

+93
-60
lines changed

‎ui/opensnitch/dialogs/stats.py

Lines changed: 93 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,23 +2190,29 @@ def _set_nodes_query(self, data):
21902190
"count(c.process) as {2}, " \
21912191
"c.uid as {3}, " \
21922192
"c.protocol as {4}, " \
2193-
"c.dst_ip as {5}, " \
2194-
"c.dst_host as {6}, " \
2195-
"c.dst_port as {7}, " \
2196-
"c.process || ' (' || c.pid || ')' as {8}, " \
2197-
"c.process_args as {9}, " \
2193+
"c.src_port as {5}, " \
2194+
"c.src_ip as {6}, " \
2195+
"c.dst_ip as {7}, " \
2196+
"c.dst_host as {8}, " \
2197+
"c.dst_port as {9}, " \
2198+
"c.pid as {10}, " \
2199+
"c.process as {11}, " \
2200+
"c.process_args as {12}, " \
21982201
"c.process_cwd as CWD, " \
2199-
"c.rule as {10} " \
2202+
"c.rule as {13} " \
22002203
"FROM connections as c " \
2201-
"WHERE c.node = '{11}' GROUP BY {12}, c.process_args, c.uid, c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.protocol {13}".format(
2204+
"WHERE c.node = '{14}' GROUP BY {15}, c.process_args, c.uid, c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.protocol {16}".format(
22022205
self.COL_STR_TIME,
22032206
self.COL_STR_ACTION,
22042207
self.COL_STR_HITS,
22052208
self.COL_STR_UID,
22062209
self.COL_STR_PROTOCOL,
2210+
self.COL_STR_SRC_PORT,
2211+
self.COL_STR_SRC_IP,
22072212
self.COL_STR_DST_IP,
22082213
self.COL_STR_DST_HOST,
22092214
self.COL_STR_DST_PORT,
2215+
self.COL_STR_PID,
22102216
self.COL_STR_PROCESS,
22112217
self.COL_STR_PROC_CMDLINE,
22122218
self.COL_STR_RULE,
@@ -2338,22 +2344,28 @@ def _set_rules_query(self, rule_name="", node=""):
23382344
"count(c.process) as {2}, " \
23392345
"c.uid as {3}, " \
23402346
"c.protocol as {4}, " \
2341-
"c.dst_port as {5}, " \
2342-
"c.dst_ip as {6}, " \
2343-
"c.dst_host as {7}, " \
2344-
"c.process as {8}, " \
2345-
"c.process_args as {9}, " \
2347+
"c.src_port as {5}, " \
2348+
"c.src_ip as {6}, " \
2349+
"c.dst_ip as {7}, " \
2350+
"c.dst_host as {8}, " \
2351+
"c.dst_port as {9}, " \
2352+
"c.pid as {10}, " \
2353+
"c.process as {11}, " \
2354+
"c.process_args as {12}, " \
23462355
"c.process_cwd as CWD " \
23472356
"FROM connections as c " \
2348-
"WHERE {10} GROUP BY c.process, c.process_args, c.uid, c.dst_ip, c.dst_host, c.dst_port {11}".format(
2357+
"WHERE {13} GROUP BY c.process, c.process_args, c.uid, c.dst_ip, c.dst_host, c.dst_port {14}".format(
23492358
self.COL_STR_TIME,
23502359
self.COL_STR_NODE,
23512360
self.COL_STR_HITS,
23522361
self.COL_STR_UID,
23532362
self.COL_STR_PROTOCOL,
2354-
self.COL_STR_DST_PORT,
2363+
self.COL_STR_SRC_PORT,
2364+
self.COL_STR_SRC_IP,
23552365
self.COL_STR_DST_IP,
23562366
self.COL_STR_DST_HOST,
2367+
self.COL_STR_DST_PORT,
2368+
self.COL_STR_PID,
23572369
self.COL_STR_PROCESS,
23582370
self.COL_STR_PROC_CMDLINE,
23592371
condition,
@@ -2369,22 +2381,28 @@ def _set_hosts_query(self, data):
23692381
"c.action as {3}, " \
23702382
"c.uid as {4}, " \
23712383
"c.protocol as {5}, " \
2372-
"c.dst_port as {6}, " \
2373-
"c.dst_ip as {7}, " \
2374-
"c.process || ' (' || c.pid || ')' as {8}, " \
2375-
"c.process_args as {9}, " \
2384+
"c.src_port as {6}, " \
2385+
"c.src_ip as {7}, " \
2386+
"c.dst_ip as {9}, " \
2387+
"c.dst_port as {8}, " \
2388+
"c.pid as {10}, " \
2389+
"c.process as {11}, " \
2390+
"c.process_args as {12}, " \
23762391
"c.process_cwd as CWD, " \
2377-
"c.rule as {10} " \
2392+
"c.rule as {13} " \
23782393
"FROM connections as c " \
2379-
"WHERE c.dst_host = '{11}' GROUP BY c.pid, {12}, c.process_args, c.src_ip, c.dst_ip, c.dst_port, c.protocol, c.action, c.node {13}".format(
2394+
"WHERE c.dst_host = '{14}' GROUP BY c.pid, {15}, c.process_args, c.src_ip, c.dst_ip, c.dst_port, c.protocol, c.action, c.node {16}".format(
23802395
self.COL_STR_TIME,
23812396
self.COL_STR_NODE,
23822397
self.COL_STR_HITS,
23832398
self.COL_STR_ACTION,
23842399
self.COL_STR_UID,
23852400
self.COL_STR_PROTOCOL,
2386-
self.COL_STR_DST_PORT,
2401+
self.COL_STR_SRC_PORT,
2402+
self.COL_STR_SRC_IP,
23872403
self.COL_STR_DST_IP,
2404+
self.COL_STR_DST_PORT,
2405+
self.COL_STR_PID,
23882406
self.COL_STR_PROCESS,
23892407
self.COL_STR_PROC_CMDLINE,
23902408
self.COL_STR_RULE,
@@ -2401,24 +2419,28 @@ def _set_process_query(self, data):
24012419
"c.action as {3}, " \
24022420
"c.uid as {4}, " \
24032421
"c.protocol as {5}, " \
2404-
"c.dst_ip as {6}, " \
2405-
"c.dst_host as {7}, " \
2406-
"c.dst_port as {8}, " \
2422+
"c.src_port as {6}, " \
2423+
"c.src_ip as {7}, " \
2424+
"c.dst_ip as {8}, " \
2425+
"c.dst_host as {9}, " \
2426+
"c.dst_port as {10}, " \
24072427
"c.pid as PID, " \
2408-
"c.process_args as {9}, " \
2428+
"c.process_args as {11}, " \
24092429
"c.process_cwd as CWD, " \
2410-
"c.rule as {10} " \
2430+
"c.rule as {12} " \
24112431
"FROM connections as c " \
2412-
"WHERE c.process = '{11}' " \
2413-
"GROUP BY c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.uid, c.action, c.node, c.pid, c.process_args {12}".format(
2432+
"WHERE c.process = '{13}' " \
2433+
"GROUP BY c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.uid, c.action, c.node, c.pid, c.process_args {14}".format(
24142434
self.COL_STR_TIME,
24152435
self.COL_STR_NODE,
24162436
self.COL_STR_HITS,
24172437
self.COL_STR_ACTION,
24182438
self.COL_STR_UID,
24192439
self.COL_STR_PROTOCOL,
2440+
self.COL_STR_SRC_PORT,
2441+
self.COL_STR_SRC_IP,
24202442
self.COL_STR_DST_IP,
2421-
self.COL_STR_DESTINATION,
2443+
self.COL_STR_DST_HOST,
24222444
self.COL_STR_DST_PORT,
24232445
self.COL_STR_PROC_CMDLINE,
24242446
self.COL_STR_RULE,
@@ -2437,31 +2459,34 @@ def _set_addrs_query(self, data):
24372459
"c.action as {3}, " \
24382460
"c.uid as {4}, " \
24392461
"c.protocol as {5}, " \
2440-
"CASE c.dst_host WHEN ''" \
2441-
" THEN c.dst_ip " \
2442-
" ELSE c.dst_host " \
2443-
"END {6}, " \
2444-
"c.dst_port as {7}, " \
2445-
"c.process || ' (' || c.pid || ')' as {8}, " \
2446-
"c.process_args as {9}, " \
2462+
"c.src_port as {6}, " \
2463+
"c.src_ip as {7}, " \
2464+
"c.dst_host as {8}, " \
2465+
"c.dst_port as {9}, " \
2466+
"c.pid as {10}, " \
2467+
"c.process as {11}, " \
2468+
"c.process_args as {12}, " \
24472469
"c.process_cwd as CWD, " \
2448-
"c.rule as {10} " \
2470+
"c.rule as {13} " \
24492471
"FROM connections as c " \
2450-
"WHERE c.dst_ip = '{11}' GROUP BY c.pid, {12}, c.process_args, c.src_ip, c.dst_port, {13}, c.protocol, c.action, c.uid, c.node {14}".format(
2472+
"WHERE c.dst_ip = '{14}' GROUP BY c.pid, {15}, c.process_args, c.src_ip, c.dst_port, {16}, c.protocol, c.action, c.uid, c.node {17}".format(
24512473
self.COL_STR_TIME,
24522474
self.COL_STR_NODE,
24532475
self.COL_STR_HITS,
24542476
self.COL_STR_ACTION,
24552477
self.COL_STR_UID,
24562478
self.COL_STR_PROTOCOL,
2457-
self.COL_STR_DESTINATION,
2479+
self.COL_STR_SRC_PORT,
2480+
self.COL_STR_SRC_IP,
2481+
self.COL_STR_DST_HOST,
24582482
self.COL_STR_DST_PORT,
2483+
self.COL_STR_PID,
24592484
self.COL_STR_PROCESS,
24602485
self.COL_STR_PROC_CMDLINE,
24612486
self.COL_STR_RULE,
24622487
data,
24632488
self.COL_STR_PROCESS,
2464-
self.COL_STR_DESTINATION,
2489+
self.COL_STR_DST_HOST,
24652490
self._get_order("1") + self._get_limit()))
24662491

24672492
def _set_ports_query(self, data):
@@ -2473,31 +2498,34 @@ def _set_ports_query(self, data):
24732498
"c.action as {3}, " \
24742499
"c.uid as {4}, " \
24752500
"c.protocol as {5}, " \
2476-
"c.dst_ip as {6}, " \
2477-
"CASE c.dst_host WHEN ''" \
2478-
" THEN c.dst_ip " \
2479-
" ELSE c.dst_host " \
2480-
"END {7}, " \
2481-
"c.process || ' (' || c.pid || ')' as {8}, " \
2482-
"c.process_args as {9}, " \
2501+
"c.src_port as {6}, " \
2502+
"c.src_ip as {7}, " \
2503+
"c.dst_ip as {8}, " \
2504+
"c.dst_host as {9}, " \
2505+
"c.pid as {10}, " \
2506+
"c.process as {11}, " \
2507+
"c.process_args as {12}, " \
24832508
"c.process_cwd as CWD, " \
2484-
"c.rule as {10} " \
2509+
"c.rule as {13} " \
24852510
"FROM connections as c " \
2486-
"WHERE c.dst_port = '{11}' GROUP BY c.pid, {12}, c.process_args, {13}, c.src_ip, c.dst_ip, c.protocol, c.action, c.uid, c.node {14}".format(
2511+
"WHERE c.dst_port = '{14}' GROUP BY c.pid, {15}, c.process_args, {16}, c.src_ip, c.dst_ip, c.protocol, c.action, c.uid, c.node {17}".format(
24872512
self.COL_STR_TIME,
24882513
self.COL_STR_NODE,
24892514
self.COL_STR_HITS,
24902515
self.COL_STR_ACTION,
24912516
self.COL_STR_UID,
24922517
self.COL_STR_PROTOCOL,
2518+
self.COL_STR_SRC_PORT,
2519+
self.COL_STR_SRC_IP,
24932520
self.COL_STR_DST_IP,
2494-
self.COL_STR_DESTINATION,
2521+
self.COL_STR_DST_HOST,
2522+
self.COL_STR_PID,
24952523
self.COL_STR_PROCESS,
24962524
self.COL_STR_PROC_CMDLINE,
24972525
self.COL_STR_RULE,
24982526
data,
24992527
self.COL_STR_PROCESS,
2500-
self.COL_STR_DESTINATION,
2528+
self.COL_STR_DST_HOST,
25012529
self._get_order("1") + self._get_limit()))
25022530

25032531
def _set_users_query(self, data):
@@ -2509,28 +2537,33 @@ def _set_users_query(self, data):
25092537
model = self._get_active_table().model()
25102538
self.setQuery(model, "SELECT " \
25112539
"MAX(c.time) as {0}, " \
2512-
"c.uid, " \
25132540
"c.node as {1}, " \
25142541
"count(c.dst_ip) as {2}, " \
25152542
"c.action as {3}, " \
25162543
"c.protocol as {4}, " \
2517-
"c.dst_ip as {5}, " \
2518-
"c.dst_host as {6}, " \
2519-
"c.dst_port as {7}, " \
2520-
"c.process || ' (' || c.pid || ')' as {8}, " \
2521-
"c.process_args as {9}, " \
2544+
"c.src_port as {5}, " \
2545+
"c.src_ip as {6}, " \
2546+
"c.dst_ip as {7}, " \
2547+
"c.dst_host as {8}, " \
2548+
"c.dst_port as {9}, " \
2549+
"c.pid as {10}, " \
2550+
"c.process as {11}, " \
2551+
"c.process_args as {12}, " \
25222552
"c.process_cwd as CWD, " \
2523-
"c.rule as {10} " \
2553+
"c.rule as {13} " \
25242554
"FROM connections as c " \
2525-
"WHERE c.uid = '{11}' GROUP BY c.pid, {12}, c.process_args, c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.protocol, c.action, c.node {13}".format(
2555+
"WHERE c.uid = '{14}' GROUP BY c.pid, {15}, c.process_args, c.src_ip, c.dst_ip, c.dst_host, c.dst_port, c.protocol, c.action, c.node {16}".format(
25262556
self.COL_STR_TIME,
25272557
self.COL_STR_NODE,
25282558
self.COL_STR_HITS,
25292559
self.COL_STR_ACTION,
25302560
self.COL_STR_PROTOCOL,
2561+
self.COL_STR_SRC_PORT,
2562+
self.COL_STR_SRC_IP,
25312563
self.COL_STR_DST_IP,
2532-
self.COL_STR_DESTINATION,
2564+
self.COL_STR_DST_HOST,
25332565
self.COL_STR_DST_PORT,
2566+
self.COL_STR_PID,
25342567
self.COL_STR_PROCESS,
25352568
self.COL_STR_PROC_CMDLINE,
25362569
self.COL_STR_RULE,

0 commit comments

Comments
 (0)