Split out deauth event and failed event

NHAS · Nov 29, 2024 · 22f32b6 · 22f32b6
1 parent f9761e9
commit 22f32b6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/internal/mfaportal/resources/static/js/challenge.js b/internal/mfaportal/resources/static/js/challenge.js
@@ -4,6 +4,7 @@ const url = (httpsEnabled ? 'wss://' : 'ws://') + window.location.host + "/chall
 
 let backoff = 200;
 let attempts = 0;
+let failed = false;
 let challenge = getCookie("challenge");
 if (challenge === null || challenge === "null" || challenge == "") {
     challenge = null
@@ -37,15 +38,22 @@ function connect() {
                     JSON.stringify({challenge: challenge
                 }));
             return
-            case "reset":
+            case "deauthed":
+                window.location.href = "/"
+                return
+            case "failed_challenge":
+                failed = true;
                 deleteCookie("challenge")
-                window.location.href = '/'
             return
         }
 
     };
 
     ws.onclose = function (e) {
+        if(failed) {
+            return
+        }
+
         console.log(`Socket is closed. Reconnect will be attempted in ${backoff} ms.`, e.reason);
         if(backoff < 1000) {
             backoff += backoff*2

diff --git a/internal/router/firewall.go b/internal/router/firewall.go
@@ -291,7 +291,7 @@ func (f *Firewall) Deauthenticate(address string) error {
 
 	err = f._deauthenticate(addr)
 
-	f.Verifier.Reset(address)
+	f.Verifier.NotifyDeauth(address)
 
 	return err
 }

diff --git a/internal/router/session_manager.go b/internal/router/session_manager.go
@@ -129,7 +129,7 @@ func (c *Challenger) Challenge(address string) error {
 	return nil
 }
 
-func (c *Challenger) Reset(address string) {
+func (c *Challenger) FailChallenge(address string) {
 	c.Lock()
 	defer c.Unlock()
 
@@ -138,7 +138,21 @@ func (c *Challenger) Reset(address string) {
 		return
 	}
 
-	conn.WriteJSON("reset")
+	conn.WriteJSON("failed_challenge")
+	conn.Close()
+	delete(c.connections, address)
+}
+
+func (c *Challenger) NotifyDeauth(address string) {
+	c.Lock()
+	defer c.Unlock()
+
+	conn, ok := c.connections[address]
+	if !ok {
+		return
+	}
+
+	conn.WriteJSON("deauthed")
 	conn.Close()
 	delete(c.connections, address)
 }
@@ -182,7 +196,7 @@ func (c *Challenger) WS(w http.ResponseWriter, r *http.Request) {
 
 	err = c.Challenge(remoteAddress.String())
 	if err != nil {
-		c.Reset(remoteAddress.String())
+		c.FailChallenge(remoteAddress.String())
 		log.Printf("%s:%s client did not complete inital ws challenge: %s", user.Username, remoteAddress, err)
 		return
 	}