diff --git a/.gitignore b/.gitignore index 85eed07..5afb0ba 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ private_key.txt public_key.txt venv/** log/** +release/* diff --git a/src/dashboard.py b/src/dashboard.py index 9417914..1407a75 100644 --- a/src/dashboard.py +++ b/src/dashboard.py @@ -227,10 +227,8 @@ def get_allowed_ip(config_name, db, peers, conf_peer_data): # Look for new peers from WireGuard def get_all_peers_data(config_name): - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + '.json')) - peers = Query() conf_peer_data = read_conf_file(config_name) config = get_dashboard_conf() @@ -287,7 +285,10 @@ def get_all_peers_data(config_name): toc = time.perf_counter() print(f"Finish fetching data in {toc - tic:0.4f} seconds") db.close() - sem.release() + try: + sem.release() + except RuntimeError as e: + pass """ Frontend Related Functions @@ -295,8 +296,7 @@ Frontend Related Functions # Search for peers def get_peers(config_name, search, sort_t): get_all_peers_data(config_name) - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peer = Query() if len(search) == 0: @@ -339,8 +339,7 @@ def get_conf_listen_port(config_name): # Get configuration total data def get_conf_total_data(config_name): - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) upload_total = 0 download_total = 0 @@ -418,8 +417,7 @@ def checkKeyMatch(private_key, public_key, config_name): if result['status'] == 'failed': return result else: - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() match = db.search(peers.id == result['data']) @@ -434,11 +432,8 @@ def checkKeyMatch(private_key, public_key, config_name): # Check if there is repeated allowed IP def check_repeat_allowed_IP(public_key, ip, config_name): + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) - - sem.acquire() - - db = TinyDB('db/' + config_name + '.json') peers = Query() peer = db.search(peers.id == public_key) if len(peer) != 1: @@ -759,7 +754,8 @@ def conf(config_name): def get_conf(config_name): config_interface = read_conf_file_interface(config_name) search = request.args.get('search') - if len(search) == 0: search = "" + if len(search) == 0: + search = "" search = urllib.parse.unquote(search) config = configparser.ConfigParser(strict=False) config.read(dashboard_conf) @@ -777,15 +773,20 @@ def get_conf(config_name): "public_key": get_conf_pub_key(config_name), "listen_port": get_conf_listen_port(config_name), "running_peer": get_conf_running_peer_number(config_name), - "conf_address": conf_address + "conf_address": conf_address, + "wg_ip": config.get("Peers","remote_endpoint"), + "sort_tag": sort, + "dashboard_refresh_interval": int(config.get("Server", "dashboard_refresh_interval")), + "peer_display_mode": peer_display_mode } if conf_data['status'] == "stopped": conf_data['checked'] = "nope" else: conf_data['checked'] = "checked" print(config.get("Peers","remote_endpoint")) - return render_template('get_conf.html', conf_data=conf_data, wg_ip=config.get("Peers","remote_endpoint"), sort_tag=sort, - dashboard_refresh_interval=int(config.get("Server", "dashboard_refresh_interval")), peer_display_mode=peer_display_mode) + return jsonify(conf_data) + # return render_template('get_conf.html', conf_data=conf_data, wg_ip=config.get("Peers","remote_endpoint"), sort_tag=sort, + # dashboard_refresh_interval=int(config.get("Server", "dashboard_refresh_interval")), peer_display_mode=peer_display_mode) # Turn on / off a configuration @app.route('/switch/', methods=['GET']) @@ -810,8 +811,7 @@ def switch(config_name): # Add peer @app.route('/add_peer/', methods=['POST']) def add_peer(config_name): - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() data = request.get_json() @@ -880,8 +880,7 @@ def add_peer(config_name): def remove_peer(config_name): if get_conf_status(config_name) == "stopped": return "Your need to turn on " + config_name + " first." - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() data = request.get_json() @@ -916,8 +915,7 @@ def save_peer_setting(config_name): DNS = data['DNS'] allowed_ip = data['allowed_ip'] endpoint_allowed_ip = data['endpoint_allowed_ip'] - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() if len(db.search(peers.id == id)) == 1: @@ -989,8 +987,7 @@ def save_peer_setting(config_name): def get_peer_name(config_name): data = request.get_json() id = data['id'] - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() result = db.search(peers.id == id) @@ -1025,7 +1022,7 @@ def check_key_match(config_name): @app.route("/qrcode/", methods=['GET']) def generate_qrcode(config_name): id = request.args.get('id') - sem.acquire() + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() get_peer = db.search(peers.id == id) @@ -1065,8 +1062,7 @@ def generate_qrcode(config_name): def download(config_name): print(request.headers.get('User-Agent')) id = request.args.get('id') - sem.acquire() - + sem.acquire(timeout=1) db = TinyDB(os.path.join(db_path, config_name + ".json")) peers = Query() get_peer = db.search(peers.id == id) @@ -1129,9 +1125,9 @@ Dashboard Tools Related @app.route('/get_ping_ip', methods=['POST']) def get_ping_ip(): config = request.form['config'] - sem.acquire() + sem.acquire(timeout=1) + db = TinyDB(os.path.join(db_path, config_name + ".json")) - db = TinyDB(os.path.join(db_path, config + ".json")) html = "" for i in db.all(): html += '' diff --git a/src/static/js/configuration.js b/src/static/js/configuration.js index a765487..7d6a4b4 100644 --- a/src/static/js/configuration.js +++ b/src/static/js/configuration.js @@ -303,7 +303,7 @@ $("body").on("change", "#sort_by_dropdown", function (){ headers:{"Content-Type": "application/json"}, url: "/update_dashboard_sort", success: function (res){ - location.reload() + load_data($('#search_peer_textbox').val()) } }) }) @@ -336,26 +336,41 @@ function copyToClipboard(element) { // Update Interval $("body").on("click", ".update_interval", function(){ - $.ajax({ - method:"POST", - data: "interval="+$(this).attr("refresh-interval"), - url: "/update_dashboard_refresh_interval", - success: function (res){ - location.reload() - } - }) - }); + $(".interval-btn-group button").removeClass("active"); + $(this).addClass("active"); + $.ajax({ + method:"POST", + data: "interval="+$(this).data("refresh-interval"), + url: "/update_dashboard_refresh_interval", + success: function (res){ + + load_data($('#search_peer_textbox').val()) + } + }) +}); $("body").on("click", ".refresh", function (){ load_data($('#search_peer_textbox').val()); }); // Switch display mode $("body").on("click", ".display_mode", function(){ + $(".display-btn-group button").removeClass("active"); + $(this).addClass("active"); + let display_mode = $(this).data("display-mode"); $.ajax({ method:"GET", - url: "/switch_display_mode/"+$(this).attr("display-mode"), + url: "/switch_display_mode/"+$(this).data("display-mode"), success: function (res){ - location.reload() + // load_data($('#search_peer_textbox').val()) + if (display_mode === "list"){ + Array($(".peer_list").children()).forEach(function(child){ + $(child).removeClass().addClass("col-12"); + }) + }else{ + Array($(".peer_list").children()).forEach(function(child){ + $(child).removeClass().addClass("col-sm-6 col-lg-4"); + }) + } } }) }) \ No newline at end of file diff --git a/src/templates/configuration.html b/src/templates/configuration.html index b1a881b..3f4612e 100644 --- a/src/templates/configuration.html +++ b/src/templates/configuration.html @@ -1,4 +1,4 @@ - + {% with title=title%} {% include "header.html"%} {% endwith %} @@ -11,7 +11,103 @@ -
+
+
+
+
+
+
+ CONFIGURATION +

{{ title }}

+
+
+ ACTION
+
+ +
+
+
+ STATUS +
+
+
+ CONNECTED PEERS +
+
+
+ TOTAL DATA USAGE +
+
+
+ TOTAL RECEIVED +
+
+
+ TOTAL SENT +
+
+
+
+ + PUBLIC KEY + CLICK TO COPY + +
+
+
+ LISTEN PORT +
+
+
+ ADDRESS +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ + + + + +
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
+
+