Improve peer details access and update signin footer UI

Peer details button is now hidden for restricted peers, showing a message instead. The signin page footer layout is updated for better alignment, and the client app link is moved to the right with improved styling.

docker/entrypoint.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 config_file="/data/wg-dashboard.ini"
+runtime_pid=""
 
 trap 'stop_service' SIGTERM
 
@@ -52,7 +53,31 @@ set_ini() {
 
 stop_service() {
   echo "[WGDashboard] Stopping WGDashboard..."
-  /bin/bash ./wgd.sh stop
+
+  local max_rounds="10"
+  local round="0"
+  local runtime_pid=""
+
+  while true; do
+    round=$((round + 1))
+
+    if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
+      runtime_pid=$(cat ${WGDASH}/src/gunicorn.pid)
+
+      echo "Running as PID: ${runtime_pid}"
+      return 0
+    fi
+
+    if [[ $round -eq $max_rounds ]]; then
+      echo "Reached breaking point!"
+      return 1
+
+    fi
+
+    sleep 0.5s
+  done
+
+  kill $runtime_pid
   exit 0
 }
 
@@ -192,9 +217,10 @@ start_and_monitor() {
 
   [[ ! -d ${WGDASH}/src/log ]] && mkdir ${WGDASH}/src/log
   [[ ! -d ${WGDASH}/src/download ]] && mkdir ${WGDASH}/src/download
+
   ${WGDASH}/src/venv/bin/gunicorn --config ${WGDASH}/src/gunicorn.conf.py
 
-  resolvconf -u
+  /usr/sbin/resolvconf -u
 
   if [ $? -ne 0 ]; then
     echo "Loading WGDashboard failed... Look above for details."
@@ -203,13 +229,14 @@ start_and_monitor() {
   # Wait a second before continuing, to give the python program some time to get ready.
   echo -e "\nEnsuring container continuation."
 
-  max_rounds="10"
-  round="0"
+  local max_rounds="10"
+  local round="0"
 
   # Hang in there for 10s for Gunicorn to get ready
   while true; do
     round=$((round + 1))
-    latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
+
+    local latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
 
     if [[ $round -eq $max_rounds ]]; then
       echo "Reached breaking point!"
@@ -235,13 +262,10 @@ start_and_monitor() {
 
   else
     tail -f "$latest_error" &
-    wait $!
+    tail_pid=$!
 
+    wait $tail_pid
   fi
-
-  echo "The blocking command has been broken! Script will exit in 3 minutes... Investigate!"
-  sleep 180s
-  exit 1
 }
 
 # Main execution flow

src/modules/Utilities.py

@@ -18,10 +18,18 @@ def GetRemoteEndpoint() -> str:
     @return: 
     """
     import socket
-    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-        s.connect(("1.1.1.1", 80))  # Connecting to a public IP
+    try:
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            s.connect(("1.1.1.1", 80))  # Connecting to a public IP
         wgd_remote_endpoint = s.getsockname()[0]
         return str(wgd_remote_endpoint)
+    except (socket.error, OSError):
+        pass
+    try:
+        return socket.gethostbyname(socket.gethostname())
+    except (socket.error, OSError):
+        pass
+    return "127.0.0.1"
 
 
 def StringToBoolean(value: str):

src/modules/WireguardConfiguration.py

@@ -404,6 +404,7 @@ class WireguardConfiguration:
                 try:
                     if "[Peer]" not in content:
                         current_app.logger.info(f"{self.Name} config has no [Peer] section")
+                        self.Peers = []
                         return
 
                     peerStarts = content.index("[Peer]")
@@ -665,9 +666,8 @@ class WireguardConfiguration:
 
         if not self.__wgSave():
             return False, "Failed to save configuration through WireGuard"
-
+        self.getRestrictedPeers()
         self.getPeers()
-
         if numOfRestrictedPeers == len(listOfPublicKeys):
             return True, f"Restricted {numOfRestrictedPeers} peer(s)"
         return False, f"Restricted {numOfRestrictedPeers} peer(s) successfully. Failed to restrict {numOfFailedToRestrictPeers} peer(s)"
@@ -783,9 +783,7 @@ class WireguardConfiguration:
                         )
                     ).mappings().fetchone()
                     if cur_i is not None:
-                        # print(cur_i is None)
                         total_sent = cur_i['total_sent']
-                        # print(cur_i is None)
                         total_receive = cur_i['total_receive']
                         cur_total_sent = float(data_usage[i][2]) / (1024 ** 3)
                         cur_total_receive = float(data_usage[i][1]) / (1024 ** 3)
@@ -1226,7 +1224,6 @@ class WireguardConfiguration:
     def __validateOverridePeerSettings(self, key: str, value: str | int) -> tuple[bool, None] | tuple[bool, str]:
         status = True
         msg = None
-        print(value)
         if key == "DNS" and value:
             status, msg = ValidateDNSAddress(value)
         elif key == "EndpointAllowedIPs" and value:

src/static/app/src/components/configurationComponents/peer.vue

@@ -134,12 +134,17 @@ export default {
 				</div>
 			</div>
 		</div>
-		<div class="card-footer" role="button" @click="$emit('details')">
+		<div class="card-footer" role="button" @click="$emit('details')" v-if="!this.Peer.restricted">
 			<small class="d-flex align-items-center">
 				<LocaleText t="Details"></LocaleText>
 				<i class="bi bi-chevron-right ms-auto"></i>
 			</small>
 		</div>
+		<div class="card-footer" v-else>
+			<small class="d-flex align-items-center text-muted">
+				<LocaleText t="Allow access to view details"></LocaleText>
+			</small>
+		</div>
 	</div>
 </template>
 

src/static/app/src/views/signin.vue

@@ -172,16 +172,6 @@ export default {
 				<RemoteServerList v-else></RemoteServerList>
 
 				<div class="d-flex mt-3" v-if="!this.store.IsElectronApp">
-					<!-- Left: Client App link -->
-					<a
-						href="/client"
-						class="btn btn-sm btn-outline-secondary"
-					>
-						<i class="bi bi-box-arrow-up-right me-1"></i>
-						<LocaleText t="Client App" />
-					</a>
-
-					<!-- Right: Remote server switch -->
 					<div class="form-check form-switch ms-auto">
 						<input
 							v-model="this.store.CrossServerConfiguration.Enable"
@@ -197,10 +187,20 @@ export default {
 				</div>
 			</div>
 		</div>
-		<small class="text-muted pb-3 d-block w-100 text-center mt-3">
-			WGDashboard {{ this.version }} | Developed with ❤️ by 
-			<a href="https://github.com/donaldzou" target="_blank"><strong>Donald Zou</strong></a>
-		</small>
+		<div class="d-flex container-fluid align-items-center my-1 w-100">
+			<small class="text-muted">
+				WGDashboard <strong>{{ this.version }}</strong> | Made with ❤️ by
+				<a href="https://github.com/WGDashboard"
+				   class="text-decoration-none text-body"
+				   target="_blank"><strong>WGDashboard</strong></a>
+			</small>
+			<a href="./client" target="_blank"
+			   class="text-decoration-none ms-auto text-body"
+			   style="white-space: nowrap">
+				<small><i class="bi bi-box-arrow-up-right me-1"></i>
+					<LocaleText t="Client App" /></small>
+			</a>
+		</div>
 		<div class="messageCentre text-body position-absolute d-flex">
 			<TransitionGroup name="message" tag="div"
 			                 class="position-relative flex-sm-grow-0 flex-grow-1 d-flex align-items-end ms-sm-auto flex-column gap-2">