auth work

auth/auth.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"goseg/config"
 	"goseg/structs"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"strings"
@@ -219,11 +220,15 @@ func AddSession(tokenID string, hash string, created string, authorized bool) er
 
 // encrypt the contents using stored keyfile val
 func KeyfileEncrypt(contents map[string]string, keyStr string) (string, error) {
+	fileBytes, err := ioutil.ReadFile(keyStr)
+    if err != nil {
+        return "", err
+    }
     contentBytes, err := json.Marshal(contents)
     if err != nil {
         return "", err
     }
-    key, err := fernet.DecodeKey(keyStr)
+    key, err := fernet.DecodeKey(string(fileBytes))
     if err != nil {
         return "", err
     }
@@ -235,7 +240,11 @@ func KeyfileEncrypt(contents map[string]string, keyStr string) (string, error) {
 }
 
 func KeyfileDecrypt(tokenStr string, keyStr string) (map[string]string, error) {
-    key, err := fernet.DecodeKey(keyStr)
+	fileBytes, err := ioutil.ReadFile(keyStr)
+    if err != nil {
+        return nil, err
+    }
+    key, err := fernet.DecodeKey(string(fileBytes))
     if err != nil {
         return nil, err
     }

ws/ws.go

@@ -23,25 +23,6 @@ var (
 	}
 )
 
-// func handleConnection(c *websocket.Conn) {
-//     // Read the first message from the client which should be the token
-//     messageType, p, err := c.ReadMessage()
-//     if err != nil {
-//         config.Logger.Error(fmt.Errorf("%v",err))
-//         return
-//     }
-//     token := string(p)
-//     // Verify the token
-//     isValid, _, err := CheckToken(token, c, false)  // 'false' assumes it's not a setup
-//     if !isValid || err != nil {
-//         config.Logger.Info("Invalid token provided by client.")
-//         c.Close()
-//         return
-//     }
-
-//     // rest of logic
-// }
-
 // switch on ws event cases
 func WsHandler(w http.ResponseWriter, r *http.Request) {
 	conf := config.Conf()
@@ -50,9 +31,6 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 		config.Logger.Error(fmt.Sprintf("Couldn't upgrade websocket connection: %v", err))
 		return
 	}
-	// manage broadcasts and clients thru the broadcast package
-	// broadcast.RegisterClient(conn)
-	// defer broadcast.UnregisterClient(conn)
 	// keepalive for ws
 	conn.SetPongHandler(func(string) error {
 		conn.SetReadDeadline(time.Now().Add(60 * time.Second))