Fix client set-cookie extraction (#391)

Author: t-aleksander

src/i18n/en/index.ts

@@ -54,6 +54,7 @@ const en = {
         'Configuration for instance {instance: string} has changed. Disconnect from all locations to apply changes.',
       deadConDropped:
         'Detected that the {con_type: string} {interface_name: string} has disconnected, trying to reconnect...',
+      noCookie: 'No defguard_proxy set-cookie received',
     },
   },
   components: {

src/i18n/i18n-types.ts

@@ -165,6 +165,10 @@ type RootTranslation = {
 			 * @param {string} interface_name
 			 */
 			deadConDropped: RequiredParams<'con_type' | 'interface_name'>
+			/**
+			 * N​o​ ​d​e​f​g​u​a​r​d​_​p​r​o​x​y​ ​s​e​t​-​c​o​o​k​i​e​ ​r​e​c​e​i​v​e​d
+			 */
+			noCookie: string
 		}
 	}
 	components: {
@@ -1762,6 +1766,10 @@ export type TranslationFunctions = {
 			 * Detected that the {con_type} {interface_name} has disconnected, trying to reconnect...
 			 */
 			deadConDropped: (arg: { con_type: string, interface_name: string }) => LocalizedString
+			/**
+			 * No defguard_proxy set-cookie received
+			 */
+			noCookie: () => LocalizedString
 		}
 	}
 	components: {

src/pages/client/pages/ClientAddInstancePage/components/AddInstanceFormCard/components/AddInstanceInitForm/AddInstanceInitForm.tsx

@@ -102,7 +102,6 @@ export const AddInstanceInitForm = ({ nextStep }: Props) => {
       body: Body.json(data),
     })
       .then(async (res: Response<EnrollmentStartResponse | EnrollmentError>) => {
-        const authCookie = res.headers['set-cookie'];
         if (!res.ok) {
           setIsLoading(false);
           error(JSON.stringify(res.data));
@@ -122,6 +121,24 @@ export const AddInstanceInitForm = ({ nextStep }: Props) => {
             }
           }
         }
+        // There may be other set-cookies, set by e.g. a proxy
+        // Get only the defguard_proxy cookie
+        const authCookie = res.rawHeaders['set-cookie'].find((cookie) =>
+          cookie.startsWith('defguard_proxy='),
+        );
+        if (!authCookie) {
+          setIsLoading(false);
+          error(
+            LL.common.messages.errorWithMessage({
+              message: LL.common.messages.noCookie(),
+            }),
+          );
+          throw Error(
+            LL.common.messages.errorWithMessage({
+              message: LL.common.messages.noCookie(),
+            }),
+          );
+        }
         debug('Response received with status OK');
         const r = res.data as EnrollmentStartResponse;
         // get client registered instances

src/pages/client/pages/ClientInstancePage/modals/UpdateInstanceModal/components/UpdateInstanceModalForm.tsx

@@ -108,7 +108,17 @@ export const UpdateInstanceModalForm = () => {
       proxy_api_url = proxy_api_url + '/api/v1';
       const instance = clientInstances.find((i) => i.uuid === enrollmentData.instance.id);
       if (instance) {
-        const authCookie = res.headers['set-cookie'];
+        const authCookie = res.rawHeaders['set-cookie'].find((cookie) =>
+          cookie.startsWith('defguard_proxy='),
+        );
+        if (!authCookie) {
+          toaster.error(
+            LL.common.messages.errorWithMessage({
+              message: LL.common.messages.noCookie(),
+            }),
+          );
+          return;
+        }
         headers['Cookie'] = authCookie;
         const instanceInfoResponse = await fetch<CreateDeviceResponse>(
           `${proxy_api_url}/enrollment/network_info`,