Add verify user on connection

Author: modembcc

collab/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"log"
 	"net/http"
 	"sync"
@@ -19,6 +20,7 @@ var upgrader = websocket.Upgrader{
 type Client struct {
 	conn   *websocket.Conn
 	roomID string
+	authenticated bool
 }
 
 // Hub maintains the set of active clients, broadcasts messages, and stores the current workspace per roomID
@@ -37,6 +39,31 @@ type Message struct {
 	content []byte
 }
 
+func verifyToken(token string) bool {
+	client := &http.Client{}
+	req, err := http.NewRequest("GET", "http://localhost:3001/auth/verify-token", nil)
+	if err != nil {
+		log.Println("Error creating request:", err)
+		return false
+	}
+
+	req.Header.Set("Authorization", "Bearer " + token)
+
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Println("Error making request:", err)
+		return false
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		log.Println("Token verification failed with status:", resp.Status)
+		return false
+	}
+
+	return true;
+}
+
 // NewHub creates a new hub instance
 func NewHub() *Hub {
 	return &Hub{
@@ -116,6 +143,32 @@ func handleMessages(client *Client, hub *Hub) {
 			break
 		}
 
+		var msgData map[string]interface{}
+		if err := json.Unmarshal(message, &msgData); err != nil {
+			log.Printf("Failed to parse message: %v", err)
+			continue
+		}
+
+		// Handle authentication message
+		if msgData["type"] == "auth" {
+			token, ok := msgData["token"].(string)
+			if !ok {
+				log.Printf("Auth message missing token")
+				continue
+			}
+			if verifyToken(token) { // Implement this function to verify the token
+				client.authenticated = true
+				log.Println("Client authenticated successfully")
+			} else {
+				log.Println("Invalid auth token")
+				client.conn.WriteMessage(websocket.TextMessage, []byte("Authentication failed"))
+				client.conn.Close()
+				break
+			}
+			continue
+		}
+
+
 		// Broadcast the message to other clients
 		hub.broadcast <- Message{roomID: client.roomID, content: message}
 	}

matching-service-api/log/matching_service_api.log

@@ -33,3 +33,5 @@ time="2024-10-16T12:12:09+08:00" level=info msg="request from user user1 success
 time="2024-10-16T12:12:14+08:00" level=info msg="request from user user2 successfully published"
 time="2024-10-16T12:16:10+08:00" level=info msg="request from user user1 successfully published"
 time="2024-10-16T12:16:15+08:00" level=info msg="request from user user2 successfully published"
+time="2024-10-25T22:40:44+08:00" level=info msg="Server started at time: 2024-10-25 22:40:44.6771508 +0800 +08 m=+0.090065801"
+time="2024-10-25T23:25:28+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"

matching-service/log/matching_service.log

@@ -23,3 +23,6 @@ time="2024-10-17T22:43:06+08:00" level=info msg="Beginning consumption from mess
 time="2024-10-17T22:43:06+08:00" level=info msg="Begin processing requests"
 time="2024-10-17T22:51:23+08:00" level=info msg="Beginning consumption from message queue"
 time="2024-10-17T22:51:23+08:00" level=info msg="Begin processing requests"
+time="2024-10-25T22:40:12+08:00" level=info msg="Beginning consumption from message queue"
+time="2024-10-25T22:40:12+08:00" level=info msg="Begin processing requests"
+time="2024-10-25T23:25:28+08:00" level=error msg="error handling incoming request: dial tcp [::1]:6379: connectex: No connection could be made because the target machine actively refused it."

peerprep/api/gateway.ts

@@ -1,11 +1,20 @@
 import { cookies } from "next/headers";
-import { LoginResponse, Question, UserServiceResponse, StatusBody } from "./structs";
+import {
+  LoginResponse,
+  Question,
+  UserServiceResponse,
+  StatusBody,
+} from "./structs";
 import DOMPurify from "isomorphic-dompurify";
 
 export function generateAuthHeaders() {
   return {
-    "Authorization": `Bearer ${cookies().get("session")?.value}`,
-  };;
+    Authorization: `Bearer ${cookies().get("session")?.value}`,
+  };
+}
+
+export function getSessionToken() {
+  return cookies().get("session")?.value;
 }
 
 export function generateJSONHeaders() {
@@ -16,15 +25,15 @@ export function generateJSONHeaders() {
 }
 
 export async function fetchQuestion(
-  questionId: string,
+  questionId: string
 ): Promise<Question | StatusBody> {
   try {
     const response = await fetch(
       `${process.env.NEXT_PUBLIC_QUESTION_SERVICE}/questions/solve/${questionId}`,
       {
         method: "GET",
         headers: generateAuthHeaders(),
-      },
+      }
     );
     if (!response.ok) {
       return {
@@ -56,7 +65,7 @@ export async function getSessionLogin(validatedFields: {
         headers: {
           "Content-type": "application/json; charset=UTF-8",
         },
-      },
+      }
     );
     const json = await res.json();
 

peerprep/api/structs.ts

@@ -59,6 +59,7 @@ export interface MatchData {
   roomId: string;
   user1: string;
   user2: string;
+  QuestionId: string
 }
 
 export interface MatchResponse {

peerprep/app/questions/[question]/[roomID]/page.tsx

@@ -1,4 +1,4 @@
-import { fetchQuestion } from "@/api/gateway";
+import { fetchQuestion, getSessionToken } from "@/api/gateway";
 import { Question as QnType, StatusBody, isError } from "@/api/structs";
 import styles from "@/style/question.module.css";
 import ErrorBlock from "@/components/shared/ErrorBlock";
@@ -20,7 +20,11 @@ async function Question({ params }: Props) {
       {isError(question) ? (
         <ErrorBlock err={question as StatusBody} />
       ) : (
-        <QuestionBlock question={question as QnType} roomID={params.roomID} />
+        <QuestionBlock
+          question={question as QnType}
+          roomID={params.roomID}
+          authToken={getSessionToken()}
+        />
       )}
     </div>
   );

peerprep/app/questions/[question]/[roomID]/question.tsx

@@ -12,6 +12,7 @@ import DOMPurify from "dompurify";
 interface Props {
   question: Question;
   roomID?: String;
+  authToken?: String;
 }
 
 interface DifficultyChipProps {
@@ -28,7 +29,7 @@ function DifficultyChip({ diff }: DifficultyChipProps) {
   );
 }
 
-function QuestionBlock({ question, roomID }: Props) {
+function QuestionBlock({ question, roomID, authToken }: Props) {
   const router = useRouter();
 
   const handleDelete = async () => {

peerprep/components/questionpage/CollabEditor.tsx

@@ -45,9 +45,10 @@ themes.forEach((theme) => require(`ace-builds/src-noconflict/theme-${theme}`));
 interface Props {
   question: Question;
   roomID?: String;
+  authToken?: String;
 }
 
-export default function CollabEditor({ question, roomID }: Props) {
+export default function CollabEditor({ question, roomID, authToken }: Props) {
   const [theme, setTheme] = useState("terminal");
   const [fontSize, setFontSize] = useState(18);
   const [language, setLanguage] = useState("python");
@@ -76,15 +77,24 @@ export default function CollabEditor({ question, roomID }: Props) {
     newSocket.onopen = () => {
       console.log("WebSocket connection established");
       setConnected(true);
+
+      const authMessage = {
+        type: "auth",
+        token: authToken,
+      };
+      newSocket.send(JSON.stringify(authMessage));
     };
 
     newSocket.onmessage = (event) => {
+      if (event.data == "Authentication failed") {
+        console.log("Authentication failed");
+        return;
+      }
+
       const message = JSON.parse(event.data);
-      console.log("Received WebSocket message:", message);
 
-      // Handle incoming WebSocket messages
       if (message.type === "content_change") {
-        setValue(message.data); // Update the editor value
+        setValue(message.data);
       }
     };
 

peerprep/components/questionpage/Matchmaking.tsx

@@ -134,7 +134,9 @@ const Matchmaking = () => {
     User2: ${matchRes.data.user2}`;
     window.alert(message);
     // redirect to question page
-    router.push(`/questions/1/${matchRes.data.roomId}`);
+    router.push(
+      `/questions/${matchRes.data.QuestionId}/${matchRes.data.roomId}`
+    );
   };
 
   usePeriodicCallback(queryResource, QUERY_INTERVAL_MILLISECONDS, isMatching);

storage-blob-api/log/matching_service_api.log

@@ -8,3 +8,10 @@ time="2024-10-16T11:55:08+08:00" level=error msg="unable to unmarshal topicTags
 time="2024-10-16T11:57:16+08:00" level=info msg="Server started running successfully"
 time="2024-10-16T12:15:40+08:00" level=info msg="Server started running successfully"
 time="2024-10-16T12:16:23+08:00" level=info msg="Request handled successfully"
+time="2024-10-25T22:39:43+08:00" level=info msg="Server started running successfully"
+time="2024-10-25T23:25:33+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
+time="2024-10-25T23:25:38+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
+time="2024-10-25T23:25:43+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
+time="2024-10-25T23:25:48+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
+time="2024-10-25T23:25:53+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
+time="2024-10-25T23:25:58+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."