Add env variable to not use SSL for local instance in collab

Author: sheenkerr

api-gateway/.env.template

@@ -44,6 +44,8 @@ USER_SERVICE_LOGIN_PATH="/us/auth/login"
 HEARTBEAT_TTL=300
 # Time-to-live (TTL) in seconds for the round-robin counter used in load balancing.
 RR_TTL=3600
+
+# To enable redis debugging endpoints, set to DEV
 ENVIRONMENT=DEV
 
 # ============================================================================

collaboration-svc/.env.template

@@ -11,7 +11,7 @@ QUESTION_SERVICE_POOL_URL=
 # Question history service register attempt endpoint
 QUESTION_SERVICE_HISTORY_URL=
 
-# API Gateway WebSocket Connection
+# API Gateway WebSocket Connection (use ws if RUN_TYPE is local, wss otherwise)
 GATEWAY_WEBSOCKET_URL=
 
 
@@ -20,9 +20,15 @@ APIGATEWAY_URL=http://localhost:8000
 REGISTRY_PATH=/registry/register-openapi
 HEARTBEAT_PATH=/registry/heartbeat
 HEARTBEAT_PERIOD=270
-HOST_URL=localhost:8006
+HOST_URL=http://localhost:8006
 FRONT_END_URL=http://localhost:5173
 
+# To enable redis debugging endpoints, set to DEV
+ENVIRONMENT=DEV
+
+# If Run Type is local, skip SSL verification for websocket connection
+RUN_TYPE=local
+
 # Logging configuration
 LOG_NAME=collaboration-svc
 LOG_LEVEL=INFO

collaboration-svc/controllers/websocket_controller.py

@@ -7,17 +7,18 @@
 from websockets import ClientConnection
 
 ENV_API_WEBSOCKET_URL = "GATEWAY_WEBSOCKET_URL"
+RUN_TYPE = get_envvar("RUN_TYPE")
 
 
 class WebSocketManager:
     def __init__(self):
         self.active_connection = None
-        
-        # Create SSL context that verifies certificates properly
-        ssl_context = ssl.create_default_context()
-        ssl_context.check_hostname = False
-        ssl_context.verify_mode = ssl.CERT_NONE
-        self.ssl_context = ssl_context
+        if RUN_TYPE != "local":
+            # Create SSL context that verifies certificates properly
+            ssl_context = ssl.create_default_context()
+            ssl_context.check_hostname = False
+            ssl_context.verify_mode = ssl.CERT_NONE
+            self.ssl_context = ssl_context
 
     def get_websocket_connection(self) -> ClientConnection:
         """
@@ -33,10 +34,15 @@ async def connect(self) -> None:
             f"Connecting to API gateway WebSocket at {get_envvar(ENV_API_WEBSOCKET_URL)}"
         )
         try:
-            self.active_connection = await websockets.connect(
-                get_envvar(ENV_API_WEBSOCKET_URL),
-                ssl=self.ssl_context,
-            )
+            if RUN_TYPE != "local":
+                self.active_connection = await websockets.connect(
+                    get_envvar(ENV_API_WEBSOCKET_URL),
+                    ssl=self.ssl_context,
+                )
+            else:
+                self.active_connection = await websockets.connect(
+                    get_envvar(ENV_API_WEBSOCKET_URL)
+                )
         except Exception:
             log.error(
                 f"Unable to establish a WebSocket connection with API gateway {get_envvar(ENV_API_WEBSOCKET_URL)}"

matching-svc/.env.template

@@ -11,9 +11,13 @@ HEARTBEAT_PATH=/registry/heartbeat
 HEARTBEAT_PERIOD=270
 HOST_URL=localhost:8005
 FRONT_END_URL=http://localhost:5173
-ENVIRONMENT=DEV
+
 USER_SERVICE_GET_USER_DETAILS_URL=http://user-svc/users/me
 
+
+# To enable redis debugging endpoints, set to DEV
+ENVIRONMENT=DEV
+
 # Logging configuration
 LOG_NAME=matching-svc
 LOG_LEVEL=INFO