backend fixes

This commit is contained in:
oscar0urselli
2022-06-12 15:12:57 +02:00
committed by DomySh
parent 18379dd8d7
commit 98652b0fa9
2 changed files with 9 additions and 5 deletions

View File

@@ -43,7 +43,7 @@
"status": <service status>, "status": <service status>,
"public_port": <public port>, "public_port": <public port>,
"internal_port": <internal port>, "internal_port": <internal port>,
"n_pacchetti": <number of rejected packets>, "n_packets": <number of rejected packets>,
"n_regex": <number of regexes> "n_regex": <number of regexes>
}, },
{ {
@@ -61,7 +61,7 @@
"status": <service status>, "status": <service status>,
"public_port": <public port>, "public_port": <public port>,
"internal_port": <internal port>, "internal_port": <internal port>,
"n_pacchetti": <number of rejected packets>, "n_packets": <number of rejected packets>,
"n_regex": <number of regexes> "n_regex": <number of regexes>
} }
``` ```
@@ -121,6 +121,7 @@
"service_id": <service_id>, "service_id": <service_id>,
"regex": <base64 encoded regex>, "regex": <base64 encoded regex>,
"is_blacklist": <true|false>, "is_blacklist": <true|false>,
"n_packets": <number of blocked packets>,
"mode": <"C"|"S"|"B"> // Client to server, server to client or both "mode": <"C"|"S"|"B"> // Client to server, server to client or both
}, },
{ {
@@ -138,6 +139,7 @@
"service_id": <service_id>, "service_id": <service_id>,
"regex": <base64 encoded regex>, "regex": <base64 encoded regex>,
"is_blacklist": <true|false>, "is_blacklist": <true|false>,
"n_packets": <number of blocked packets>,
"mode" <"C"|"S"|"B"> // Client to server, server to client or both "mode" <"C"|"S"|"B"> // Client to server, server to client or both
} }
``` ```

View File

@@ -93,7 +93,7 @@ def get_services():
'public_port': i[3], 'public_port': i[3],
'internal_port': i[2], 'internal_port': i[2],
'n_regex': n_regex, 'n_regex': n_regex,
'n_pacchetti': n_pacchetti if n_pacchetti else 0 'n_packets': n_pacchetti if n_pacchetti else 0
}) })
return jsonify(res) return jsonify(res)
@@ -192,7 +192,8 @@ def get_service_regexes(serv):
'service_id': i[2], 'service_id': i[2],
'regex': i[0], 'regex': i[0],
'is_blacklist': i[3], 'is_blacklist': i[3],
'mode': i[1] 'mode': i[1],
'n_packets': i[4]
}) })
return jsonify(res) return jsonify(res)
@@ -209,7 +210,8 @@ def get_regex_id(regex_id):
'service_id': q[0][2], 'service_id': q[0][2],
'regex': q[0][0], 'regex': q[0][0],
'is_blacklist': q[0][3], 'is_blacklist': q[0][3],
'mode': q[0][1] 'mode': q[0][1],
'n_packets': q[0][4]
} }
return res return res