Commit

2025-08-27 23:41:14 +00:00 · 2021-05-04 21:26:40 -04:00
parent b17575b197
commit 040f6a8393
10 changed files with 215 additions and 108 deletions
--- a/src/dashboard.py
+++ b/src/dashboard.py
@@ -11,17 +11,17 @@ import configparser
 # PIP installed library
 import ifcfg
 from tinydb import TinyDB, Query
-
-
 dashboard_version = 'v2.0'
 dashboard_conf = 'wg-dashboard.ini'
-conf_location = "/etc/wireguard"
+update = ""
+
 app = Flask("Wireguard Dashboard")
 app.secret_key = secrets.token_urlsafe(16)
 app.config['TEMPLATES_AUTO_RELOAD'] = True
 conf_data = {}


+
 def get_conf_peer_key(config_name):
    keys = []
    try:
@@ -53,7 +53,7 @@ def get_conf_running_peer_number(config_name):

 def read_conf_file(config_name):
    # Read Configuration File Start
-    conf_location = "/etc/wireguard/" + config_name + ".conf"
+    conf_location = wg_conf_path+"/" + config_name + ".conf"
    f = open(conf_location, 'r')
    file = f.read().split("\n")
    conf_peer_data = {
@@ -188,7 +188,7 @@ def get_peers(config_name):

 def get_conf_pub_key(config_name):
    conf = configparser.ConfigParser(strict=False)
-    conf.read(conf_location+"/"+config_name+".conf")
+    conf.read(wg_conf_path + "/" + config_name + ".conf")
    pri = conf.get("Interface", "PrivateKey")
    pub = subprocess.check_output("echo '" + pri + "' | wg pubkey", shell=True)
    conf.clear()
@@ -197,7 +197,7 @@ def get_conf_pub_key(config_name):

 def get_conf_listen_port(config_name):
    conf = configparser.ConfigParser(strict=False)
-    conf.read(conf_location + "/" + config_name + ".conf")
+    conf.read(wg_conf_path + "/" + config_name + ".conf")
    port = conf.get("Interface", "ListenPort")
    conf.clear()
    return port
@@ -224,7 +224,7 @@ def get_conf_status(config_name):

 def get_conf_list():
    conf = []
-    for i in os.listdir(conf_location):
+    for i in os.listdir(wg_conf_path):
        if not i.startswith('.'):
            if ".conf" in i:
                i = i.replace('.conf', '')
@@ -246,6 +246,8 @@ def auth_req():
    conf = configparser.ConfigParser(strict=False)
    conf.read(dashboard_conf)
    req = conf.get("Server", "auth_req")
+    session['update'] = update
+    session['dashboard_version'] = dashboard_version
    if req == "true":
        if '/static/' not in request.path and \
                request.endpoint != "signin" and \
@@ -256,7 +258,7 @@ def auth_req():
            print("not loggedin")
            return redirect(url_for("signin"))
    else:
-        if request.endpoint in ['signin', 'signout', 'auth', 'settings', 'update_acct', 'update_pwd', 'update_app_ip_port']:
+        if request.endpoint in ['signin', 'signout', 'auth', 'settings', 'update_acct', 'update_pwd', 'update_app_ip_port', 'update_wg_conf_path']:
            return redirect(url_for("index"))

@app.route('/signin', methods=['GET'])
@@ -289,7 +291,7 @@ def settings():
        session.pop("message")
        session.pop("message_status")
    required_auth = config.get("Server", "auth_req")
-    return render_template('settings.html',conf=get_conf_list(),message=message, status=status, app_ip = config.get("Server", "app_ip"), app_port = config.get("Server", "app_port"), required_auth=required_auth)
+    return render_template('settings.html',conf=get_conf_list(),message=message, status=status, app_ip=config.get("Server", "app_ip"), app_port=config.get("Server", "app_port"), required_auth=required_auth, wg_conf_path=config.get("Server", "wg_conf_path"))

@app.route('/auth', methods=['POST'])
 def auth():
@@ -362,19 +364,24 @@ def update_app_ip_port():
    config.clear()
    os.system('bash wgd.sh restart')

-@app.route('/check_update_dashboard', methods=['GET'])
-def check_update_dashboard():
-    conf = configparser.ConfigParser(strict=False)
-    conf.read(dashboard_conf)
-    data = urllib.request.urlopen("https://api.github.com/repos/donaldzou/wireguard-dashboard/releases").read()
-    output = json.loads(data)
-    if conf.get("Server", "version") == output[0]["tag_name"]:
-        return "false"
-    else:
-        return "true"
+@app.route('/update_wg_conf_path', methods=['POST'])
+def update_wg_conf_path():
+    config = configparser.ConfigParser(strict=False)
+    config.read(dashboard_conf)
+    config.set("Server", "wg_conf_path", request.form['wg_conf_path'])
+    config.write(open(dashboard_conf, "w"))
+    session['message'] = "WireGuard Configuration Path Update Successfully!"
+    session['message_status'] = "success"
+    config.clear()
+    os.system('bash wgd.sh restart')
+
+# @app.route('/check_update_dashboard', methods=['GET'])
+# def check_update_dashboard():
+#    return have_update

@app.route('/', methods=['GET'])
 def index():
+    print(request.referrer)
    return render_template('index.html', conf=get_conf_list())

@app.route('/configuration/<config_name>', methods=['GET'])
@@ -427,7 +434,8 @@ def switch(config_name):
            status = subprocess.check_output("wg-quick up " + config_name, shell=True)
        except Exception:
            return redirect('/')
-    return redirect('/')
+
+    return redirect(request.referrer)


@app.route('/add_peer/<config_name>', methods=['POST'])
@@ -453,6 +461,9 @@ def add_peer(config_name):

@app.route('/remove_peer/<config_name>', methods=['POST'])
 def remove_peer(config_name):
+    if get_conf_status(config_name) == "stopped":
+        return "Your need to turn on "+config_name+" first."
+
    db = TinyDB("db/" + config_name + ".json")
    peers = Query()
    data = request.get_json()
@@ -494,8 +505,7 @@ def get_peer_name(config_name):

 def init_dashboard():
    # Set Default INI File
-    conf = configparser.ConfigParser(strict=False)
-    if os.path.isfile("wg-dashboard.ini") == False:
+    if not os.path.isfile("wg-dashboard.ini"):
        conf_file = open("wg-dashboard.ini", "w+")
    config = configparser.ConfigParser(strict=False)
    config.read(dashboard_conf)
@@ -509,6 +519,8 @@ def init_dashboard():

    if "Server" not in config:
        config['Server'] = {}
+    if 'wg_conf_path' not in config['Server']:
+        config['Server']['wg_conf_path'] = '/etc/wireguard'
    if 'app_ip' not in config['Server']:
        config['Server']['app_ip'] = '0.0.0.0'
    if 'app_port' not in config['Server']:
@@ -518,13 +530,27 @@ def init_dashboard():
    if 'version' not in config['Server'] or config['Server']['version'] != dashboard_version:
        config['Server']['version'] = dashboard_version
    config.write(open(dashboard_conf, "w"))
+    config.clear()
+
+def check_update():
+    conf = configparser.ConfigParser(strict=False)
+    conf.read(dashboard_conf)
+    data = urllib.request.urlopen("https://api.github.com/repos/donaldzou/wireguard-dashboard/releases").read()
+    output = json.loads(data)
+    if conf.get("Server", "version") == output[0]["tag_name"]:
+        return "false"
+    else:
+        return "true"
+

 if __name__ == "__main__":
    init_dashboard()
+    update = check_update()
    config = configparser.ConfigParser(strict=False)
    config.read('wg-dashboard.ini')
    app_ip = config.get("Server", "app_ip")
    app_port = config.get("Server", "app_port")
+    wg_conf_path = config.get("Server", "wg_conf_path")
    config.clear()
    app.run(host=app_ip, debug=False, port=app_port)

--- a/src/templates/configuration.html
+++ b/src/templates/configuration.html
@@ -108,13 +108,7 @@
          </div>
    </div>
 </body>
-<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
-	integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
-	crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js"
-	integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s"
-	crossorigin="anonymous"></script>
+{% include "footer.html" %}
 <script>
    $(".sb-{{conf_data['name']}}-url").addClass("active");

@@ -129,11 +123,6 @@
 			async:false,
 			success: function (response){
 				$("#config_body").html(response);
-				$.ajax({
-					url: "{{ url_for('static',filename='bootstrap4-toggle.min.js') }}",
-					dataType: "script",
-            		cache: true
-				});
 			}
 		})
 	}
@@ -146,19 +135,14 @@
 </script>
 <script>
    $("body").on("click", ".switch", function (){
-        if ($(this).prop('checked') === true){
-			if (confirm('Are you sure you want to turn off this connection?')){
-				location.replace("/switch/"+$(this).attr('id'))
-			}
-		}
-		else{
-			location.replace("/switch/"+$(this).attr('id'))
-		}
+        $(this).siblings($(".spinner-border")).css("display", "inline-block");
+         $(this).remove()
+       location.replace("/switch/"+$(this).attr('id'));
    })
+
 	$("#save_peer").click(function(){
 		if ($("#allowed_ips") != "" && $("#public_key") != ""){
 			var conf = $(this).attr('conf_id')
-
 			$.ajax({
 				method: "POST",
 				url: "/add_peer/"+conf,
--- a/src/templates/footer.html
+++ b/src/templates/footer.html
@@ -5,16 +5,4 @@
 	crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js"
 	integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s"
-	crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
-<script>
-    $.ajax({
-        method: "GET",
-        url: "/check_update_dashboard",
-        success: function (response){
-            if (response === "true"){
-                $(".sb-update-url").append("<span class=\"dot dot-running\"></span>")
-            }
-        }
-    })
-</script>
+	crossorigin="anonymous"></script>
--- a/src/templates/get_conf.html
+++ b/src/templates/get_conf.html
@@ -1,26 +1,27 @@
 <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mt-4">
 	<div class="info mt-4">
 		<div class="row">
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>CONFIGURATION</strong></small>
 				<h1 class="mb-3">{{conf_data['name']}}</h1>
 			</div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>ACTION</strong></small><br>
-{#				<input class="mt-2 switch" id="{{conf_data['name']}}" type="checkbox" data-toggle="toggle"  {{conf_data['checked']}} data-size="sm">#}
-
                {% if conf_data['checked'] == "checked" %}
                    <a href="#" id="{{conf_data['name']}}" {{conf_data['checked']}} class="switch text-primary"><i class="bi bi-toggle2-on"></i> ON</a>
                {% else %}
                    <a href="#" id="{{conf_data['name']}}" {{conf_data['checked']}} class="switch text-secondary"><i class="bi bi-toggle2-off"></i> OFF</a>
                {% endif %}
+                <div class="spinner-border text-primary" role="status" style="display: none; margin-top: 10px">
+                    <span class="sr-only">Loading...</span>
+                </div>
 			</div>
 			<div class="w-100"></div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>STATUS</strong></small>
 				<h6 style="text-transform: uppercase;">{{conf_data['status']}}<span class="dot dot-{{conf_data['status']}}"></span></h6>
 			</div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>CONNECTED PEERS</strong></small>
 				<h6 style="text-transform: uppercase;">{{conf_data['running_peer']}}</h6>
 			</div>
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -5,6 +5,7 @@
 	<div class="container-fluid">
        {% include "sidebar.html" %}
 		<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
+            <h1 class="pb-4 mt-4">Home</h1>
 			{% for i in conf%}
 				<div class="card mt-3">
 					<div class="card-body">
@@ -25,10 +26,13 @@
 							</div>
 							<div class="col-md">
                                {% if i['checked'] == "checked" %}
-                                    <a href="#" id="{{i['conf']}}" {{i['checked']}} class="switch text-primary"><i class="bi bi-toggle2-on"></i></a>
+                                    <a href="#" id="{{i['conf']}}" {{i['checked']}} class="switch text-primary tt"><i class="bi bi-toggle2-on"></i></a>
                                {% else %}
                                    <a href="#" id="{{i['conf']}}" {{i['checked']}} class="switch text-secondary"><i class="bi bi-toggle2-off"></i></a>
                                {% endif %}
+                                <div class="spinner-border text-primary" role="status" style="display: none">
+                                    <span class="sr-only">Loading...</span>
+                                </div>
 							</div>
 						</div>
 					</div>
@@ -40,6 +44,8 @@
 {% include "footer.html" %}
 <script>
 	$('.switch').click(function() {
+	    $(this).siblings($(".spinner-border")).css("display", "inline-block")
+	    $(this).remove()
 		location.replace("/switch/"+$(this).attr('id'))
    });
 	$(".sb-home-url").addClass("active")
--- a/src/templates/settings.html
+++ b/src/templates/settings.html
@@ -22,6 +22,15 @@
                        </div>
                    </form>
                    <hr>
+                    <h3>WireGuard Configuration Path</h3>
+                    <form action="/update_wg_conf_path" method="post" class="update_wg_conf_path">
+                        <div class="form-group">
+                        <label for="username">Path</label>
+                        <input type="text" class="form-control mb-4" id="wg_conf_path" name="wg_conf_path" value="{{ wg_conf_path }}">
+                        <button class="btn btn-danger change_path">Update Path & Restart Dashboard</button>
+                        </div>
+                    </form>
+                    <hr>
                    <h3>Security</h3>
                    <form action="/update_pwd", method="post">
                        <div class="form-group">
@@ -102,6 +111,21 @@
            $(".confirm_restart").html("Redirecting you in "+countdown+" seconds.")
            countdown--;
        },1000)
-    })
+    });
+
+    $(".change_path").click(function (){
+        $(this).attr("disabled", "disabled");
+        countdown = 5;
+        setInterval(function (){
+            if (countdown === 0){
+                location.reload()
+            }
+            $(".change_path").html("Redirecting you in "+countdown+" seconds.")
+            countdown--;
+        },1000)
+        $.post('/update_wg_conf_path', $('.update_wg_conf_path').serialize())
+
+    });
+
 </script>
 </html>
--- a/src/templates/sidebar.html
+++ b/src/templates/sidebar.html
@@ -7,7 +7,9 @@
                    {% if "username" in session %}
                        <li class="nav-item"><a class="nav-link sb-settings-url" href="/settings">Settings</a></li>
                    {% endif %}
-                    <li class="nav-item"><a class="nav-link sb-update-url" href="/">Check Update</a></li>
+                    {% if session['update'] == "true" %}
+                    <li class="nav-item sb-update-li"><a class="nav-link sb-update-url" href="/">New Update Available!<span class="dot dot-running"></span></a></li>
+                    {% endif %}
                </ul>
                <hr>
                <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
@@ -24,6 +26,9 @@
                            <li class="nav-item"><a class="nav-link text-danger" href="/signout" style="font-weight: bold">Sign Out</a></li>
                    </ul>
                {% endif %}
+                 <ul class="nav flex-column">
+                     <li class="nav-item"><a href="https://github.com/donaldzou/wireguard-dashboard"><small class="nav-link text-muted">{{ session['dashboard_version'] }}</small></a></li>
+                 </ul>
            </div>
        </nav>
    </div>
--- a/src/wgd.sh
+++ b/src/wgd.sh
@@ -43,6 +43,18 @@ start_wgd_debug() {
  python3 "$app_name"
 }

+update_wgd() {
+  git pull
+  if check_wgd_status; then
+     stop_wgd
+     sleep 2
+     printf "Wireguard Dashboard is stopped. \n"
+     start_wgd_debug
+  else
+    start_wgd_debug
+  fi
+}
+


 if [ "$#" != 1 ];
@@ -63,7 +75,7 @@ if [ "$#" != 1 ];
              printf "Wireguard Dashboard is not running. \n"
        fi
      elif [ "$1" = "update" ]; then
-        echo "update";
+        update_wgd
      elif [ "$1" = "restart" ]; then
         if check_wgd_status; then
           stop_wgd