Improved stability
This commit is contained in:
210
backend/app.py
210
backend/app.py
@@ -1,4 +1,4 @@
|
||||
import sqlite3, random, string, subprocess
|
||||
import sqlite3, random, string, subprocess, sys, threading, os
|
||||
from flask import Flask, jsonify, request, abort
|
||||
|
||||
|
||||
@@ -7,41 +7,61 @@ class SQLite():
|
||||
self.conn = None
|
||||
self.cur = None
|
||||
self.db_name = db_name
|
||||
self.lock = threading.Lock()
|
||||
|
||||
def connect(self) -> None:
|
||||
if not os.path.exists("db"): os.mkdir("db")
|
||||
try:
|
||||
self.conn = sqlite3.connect(self.db_name + '.db', check_same_thread = False)
|
||||
except:
|
||||
self.conn = sqlite3.connect("db/" + self.db_name + '.db', check_same_thread = False)
|
||||
except Exception:
|
||||
with open(self.db_name + '.db', 'x') as f:
|
||||
pass
|
||||
|
||||
self.conn = sqlite3.connect(self.db_name + '.db', check_same_thread = False)
|
||||
|
||||
self.cur = self.conn.cursor()
|
||||
self.conn = sqlite3.connect("db/" + self.db_name + '.db', check_same_thread = False)
|
||||
|
||||
def disconnect(self) -> None:
|
||||
self.conn.close()
|
||||
|
||||
def check_integrity(self, tables = {}) -> None:
|
||||
cur = self.conn.cursor()
|
||||
for t in tables:
|
||||
self.cur.execute('''
|
||||
cur.execute('''
|
||||
SELECT name FROM sqlite_master WHERE type='table' AND name='{}';
|
||||
'''.format(t))
|
||||
|
||||
if len(self.cur.fetchall()) == 0:
|
||||
self.cur.execute('''CREATE TABLE main.{}({});'''.format(t, ''.join([(c + ' ' + tables[t][c] + ', ') for c in tables[t]])[:-2]))
|
||||
|
||||
if len(cur.fetchall()) == 0:
|
||||
cur.execute('''CREATE TABLE main.{}({});'''.format(t, ''.join([(c + ' ' + tables[t][c] + ', ') for c in tables[t]])[:-2]))
|
||||
cur.close()
|
||||
|
||||
def query(self, query, values = ()):
|
||||
self.cur.execute(query, values)
|
||||
return self.cur.fetchall()
|
||||
cur = self.conn.cursor()
|
||||
try:
|
||||
with self.lock:
|
||||
cur.execute(query, values)
|
||||
return cur.fetchall()
|
||||
finally:
|
||||
cur.close()
|
||||
self.conn.commit()
|
||||
|
||||
def from_name_get_id(name):
|
||||
serv_id = name.strip().replace(" ","-")
|
||||
serv_id = "".join([c for c in serv_id if c in (string.ascii_uppercase + string.ascii_lowercase + string.digits + "-")])
|
||||
return serv_id.lower()
|
||||
|
||||
def gen_internal_port():
|
||||
while True:
|
||||
res = random.randint(30000, 45000)
|
||||
if len(db.query('SELECT 1 FROM services WHERE internal_port = ?;', (res,))) == 0:
|
||||
break
|
||||
return res
|
||||
|
||||
# DB init
|
||||
db = SQLite('firegex')
|
||||
db.connect()
|
||||
|
||||
|
||||
app = Flask(__name__)
|
||||
|
||||
DEBUG = len(sys.argv) > 1 and sys.argv[1] == "DEBUG"
|
||||
|
||||
@app.route('/api/general-stats')
|
||||
def get_general_stats():
|
||||
n_services = db.query('''
|
||||
@@ -54,15 +74,12 @@ def get_general_stats():
|
||||
SELECT SUM(blocked_packets) FROM regexes;
|
||||
''')[0][0]
|
||||
|
||||
res = {
|
||||
return {
|
||||
'services': n_services,
|
||||
'regexes': n_regexes,
|
||||
'closed': n_packets if n_packets else 0
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/services')
|
||||
def get_services():
|
||||
res = []
|
||||
@@ -86,14 +103,10 @@ def get_services():
|
||||
@app.route('/api/service/<serv>')
|
||||
def get_service(serv):
|
||||
q = db.query('SELECT * FROM services WHERE service_id = ?;', (serv,))
|
||||
|
||||
res = {}
|
||||
if len(q) != 0:
|
||||
n_regex = db.query('SELECT COUNT (*) FROM regexes WHERE service_id = ?;', (serv,))[0][0]
|
||||
n_packets = db.query('SELECT SUM(blocked_packets) FROM regexes WHERE service_id = ?;', (serv,))[0][0]
|
||||
|
||||
print(q[0])
|
||||
res = {
|
||||
return {
|
||||
'id': q[0][1],
|
||||
'status': q[0][0],
|
||||
'public_port': q[0][3],
|
||||
@@ -105,167 +118,146 @@ def get_service(serv):
|
||||
else:
|
||||
return abort(404)
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/service/<serv>/stop')
|
||||
def get_service_stop(serv):
|
||||
db.query('''
|
||||
UPDATE services SET status = 'stop' WHERE service_id = ?;
|
||||
''', (serv,))
|
||||
|
||||
res = {
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
@app.route('/api/service/<serv>/pause')
|
||||
def get_service_pause(serv):
|
||||
db.query('''
|
||||
UPDATE services SET status = 'pause' WHERE service_id = ?;
|
||||
''', (serv,))
|
||||
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
@app.route('/api/service/<serv>/start')
|
||||
def get_service_start(serv):
|
||||
db.query('''
|
||||
UPDATE services SET status = 'active' WHERE service_id = ?;
|
||||
UPDATE services SET status = 'wait' WHERE service_id = ?;
|
||||
''', (serv,))
|
||||
|
||||
res = {
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/service/<serv>/delete')
|
||||
def get_service_delete(serv):
|
||||
db.query('''
|
||||
DELETE FROM services WHERE service_id = ?;
|
||||
''', (serv,))
|
||||
db.query('DELETE FROM services WHERE service_id = ?;', (serv,))
|
||||
db.query('DELETE FROM regexes WHERE service_id = ?;', (serv,))
|
||||
|
||||
res = {
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/service/<serv>/terminate')
|
||||
def get_service_termite(serv):
|
||||
db.query('''
|
||||
UPDATE services SET status = 'stop' WHERE service_id = ?;
|
||||
''', (serv,))
|
||||
|
||||
res = {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/service/<serv>/regen-port')
|
||||
def get_regen_port(serv):
|
||||
db.query('UPDATE services SET public_port = ? WHERE service_id = ?;', (random.randint(30000, 45000), serv))
|
||||
|
||||
res = {
|
||||
db.query('UPDATE services SET internal_port = ? WHERE service_id = ?;', (gen_internal_port(), serv))
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/service/<serv>/regexes')
|
||||
def get_service_regexes(serv):
|
||||
res = []
|
||||
for i in db.query('SELECT * FROM regexes WHERE service_id = ?;', (serv,)):
|
||||
res.append({
|
||||
'id': i[5],
|
||||
'service_id': i[2],
|
||||
'regex': i[0],
|
||||
'is_blacklist': i[3],
|
||||
'mode': i[1]
|
||||
})
|
||||
|
||||
return jsonify(res)
|
||||
return jsonify([
|
||||
{
|
||||
'id': row[5],
|
||||
'service_id': row[2],
|
||||
'regex': row[0],
|
||||
'is_blacklist': True if row[3] == "1" else False,
|
||||
'mode': row[1],
|
||||
'n_packets': row[4],
|
||||
} for row in db.query('SELECT * FROM regexes WHERE service_id = ?;', (serv,))
|
||||
])
|
||||
|
||||
|
||||
@app.route('/api/regex/<int:regex_id>')
|
||||
def get_regex_id(regex_id):
|
||||
q = db.query('SELECT * FROM regexes WHERE regex_id = ?;', (regex_id,))
|
||||
|
||||
res = {}
|
||||
if len(q) != 0:
|
||||
res = {
|
||||
return {
|
||||
'id': regex_id,
|
||||
'service_id': q[0][2],
|
||||
'regex': q[0][0],
|
||||
'is_blacklist': q[0][3],
|
||||
'mode': q[0][1]
|
||||
'is_blacklist': True if q[0][3] == "1" else False,
|
||||
'mode': q[0][1],
|
||||
'n_packets': q[0][4],
|
||||
}
|
||||
|
||||
return res
|
||||
else:
|
||||
return abort(404)
|
||||
|
||||
|
||||
@app.route('/api/regex/<int:regex_id>/delete')
|
||||
def get_regex_delete(regex_id):
|
||||
db.query('DELETE FROM regexes WHERE regex_id = ?;', (regex_id,))
|
||||
|
||||
res = {
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/regexes/add', methods = ['POST'])
|
||||
def post_regexes_add():
|
||||
req = request.get_json(force = True)
|
||||
|
||||
db.query('''
|
||||
INSERT INTO regexes (regex_id, service_id, regex, is_blacklist, mode) VALUES (?, ?, ?, ?, ?);
|
||||
''', (random.randint(1, 1 << 32), req['service_id'], req['regex'], req['is_blacklist'], req['mode']))
|
||||
INSERT INTO regexes (service_id, regex, is_blacklist, mode) VALUES (?, ?, ?, ?);
|
||||
''', (req['service_id'], req['regex'], req['is_blacklist'], req['mode']))
|
||||
|
||||
res = {
|
||||
return {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@app.route('/api/services/add', methods = ['POST'])
|
||||
def post_services_add():
|
||||
req = request.get_json(force = True)
|
||||
serv_id = from_name_get_id(req['name'])
|
||||
|
||||
serv_id = req['name'].strip().replace(" ","-")
|
||||
serv_id = "".join([c for c in serv_id if c in (string.ascii_uppercase + string.ascii_lowercase + string.digits + "-")])
|
||||
serv_id = serv_id.lower()
|
||||
try:
|
||||
db.query('''
|
||||
INSERT INTO services (name, service_id, internal_port, public_port, status) VALUES (?, ?, ?, ?, ?)
|
||||
''', (req['name'], serv_id, gen_internal_port(), req['port'], 'stop'))
|
||||
except sqlite3.IntegrityError:
|
||||
return {'status': 'Name or/and port of the service has been already assigned to another service'}
|
||||
|
||||
return {'status': 'ok'}
|
||||
|
||||
db.query('''
|
||||
INSERT INTO services (name, service_id, internal_port, public_port, status) VALUES (?, ?, ?, ?, ?)
|
||||
''', (req['name'], serv_id, req['port'], random.randint(30000, 45000), 'stop'))
|
||||
|
||||
res = {
|
||||
'status': 'ok'
|
||||
}
|
||||
|
||||
return res
|
||||
if DEBUG:
|
||||
from flask_cors import CORS
|
||||
cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
|
||||
|
||||
if __name__ == '__main__':
|
||||
db.check_integrity({
|
||||
'services': {
|
||||
'status': 'VARCHAR(100)',
|
||||
'service_id': 'VARCHAR(100) PRIMARY KEY',
|
||||
'internal_port': 'INT NOT NULL UNIQUE',
|
||||
'public_port': 'INT NOT NULL UNIQUE',
|
||||
'name': 'VARCHAR(100) NOT NULL'
|
||||
},
|
||||
'regexes': {
|
||||
'regex': 'TEXT NOT NULL',
|
||||
'mode': 'CHAR(1)',
|
||||
'service_id': 'TEXT NOT NULL',
|
||||
'is_blacklist': 'CHAR(50) NOT NULL',
|
||||
'blocked_packets': 'INTEGER DEFAULT 0',
|
||||
'regex_id': 'INTEGER NOT NULL'
|
||||
'mode': 'VARCHAR(1)',
|
||||
'service_id': 'VARCHAR(100) NOT NULL',
|
||||
'is_blacklist': 'VARCHAR(1) NOT NULL',
|
||||
'blocked_packets': 'INTEGER NOT NULL DEFAULT 0',
|
||||
'regex_id': 'INTEGER PRIMARY KEY',
|
||||
'FOREIGN KEY (service_id)':'REFERENCES services (service_id)'
|
||||
},
|
||||
'services': {
|
||||
'status': 'CHAR(50)',
|
||||
'service_id': 'TEXT NOT NULL',
|
||||
'internal_port': 'INT NOT NULL',
|
||||
'public_port': 'INT NOT NULL',
|
||||
'name': 'TEXT NOT NULL'
|
||||
}
|
||||
})
|
||||
|
||||
#uwsgi
|
||||
subprocess.run(["uwsgi","--socket","/tmp/uwsgi.sock","--master","--module","app:app"])
|
||||
if DEBUG:
|
||||
app.run(host="0.0.0.0", port=8080 ,debug=True)
|
||||
else:
|
||||
subprocess.run(["uwsgi","--socket","./uwsgi.sock","--master","--module","app:app"])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user