fix socketio cors authentication for object detection and qa metrics …

…requests
microsoft · Dec 13, 2023 · c87cda2 · c87cda2
1 parent 6afef2e
commit c87cda2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/apps/widget/src/app/callFlaskService.ts b/apps/widget/src/app/callFlaskService.ts
@@ -49,7 +49,8 @@ export async function connectToFlaskService<TRequest, TResponse>(
     }
     const url = config.baseUrl;
     const socket = io(url, {
-      reconnectionDelayMax: 10000
+      reconnectionDelayMax: 10000,
+      withCredentials: config.withCredentials
     });
     socket.on("connect", () => {
       console.log(`socket connected, socket id: ${socket.id}, url: ${url}`);

diff --git a/rai_core_flask/rai_core_flask/environments/azure_nb_environment.py b/rai_core_flask/rai_core_flask/environments/azure_nb_environment.py
@@ -41,7 +41,12 @@ def __init__(self, service):
                 self.successfully_detected = True
                 self.nbvm_origins = [
                     f"https://{instance_name}.{domain_suffix}",
-                    f"https://{instance_name}-{service.port}.{domain_suffix}"
+                    f"https://{instance_name}-{service.port}.{domain_suffix}",
+                    f"wss://{instance_name}.{domain_suffix}",
+                    f"wss://{instance_name}-{service.port}.{domain_suffix}",
+                    "https://ml.azure.com",
+                    "https://dev.ml.azure.com",
+                    "https://int.ml.azure.com"
                 ]
 
     def get_nbvm_config(self):

diff --git a/rai_core_flask/rai_core_flask/flask_helper.py b/rai_core_flask/rai_core_flask/flask_helper.py
@@ -33,7 +33,6 @@ def __init__(self, ip=None, port=None, with_credentials=False):
         self.with_credentials = with_credentials
         # dictionary to store arbitrary state for use by consuming classes
         self.shared_state = {}
-        self.socketio = SocketIO(self.app)
         if self.ip is None:
             self.ip = "localhost"
         if self.port is None:
@@ -57,6 +56,11 @@ def __init__(self, ip=None, port=None, with_credentials=False):
             FlaskHelper._is_local_port_available(self.ip, self.port,
                                                  raise_error=True)
         self.env = build_environment(self)
+        if hasattr(self.env, 'nbvm_origins'):
+            self.socketio = SocketIO(
+                self.app, cors_allowed_origins=self.env.nbvm_origins)
+        else:
+            self.socketio = SocketIO(self.app)
         if self.env.base_url is None:
             return
         # Sleep for 1 second in order to prevent random errors while