fix(ipc): ensure lower cased bundle ID in hostname check

socketsupply · Nov 7, 2024 · a1b6ecd · a1b6ecd
1 parent 194a5fd
commit a1b6ecd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/ipc/bridge.cc b/src/ipc/bridge.cc
@@ -548,7 +548,7 @@ export * from '{{url}}'
       String contentLocation;
 
       // application resource or service worker request at `socket://<bundle_identifier>/*`
-      if (request->hostname == bundleIdentifier) {
+      if (toLowerCase(request->hostname) == toLowerCase(bundleIdentifier)) {
         const auto resolved = this->navigator.location.resolve(request->pathname, applicationResources);
 
         if (resolved.redirect) {
@@ -715,7 +715,7 @@ export * from '{{url}}'
             #else
             "socket://" +
             #endif
-            bundleIdentifier +
+            toLowerCase(bundleIdentifier) +
             contentLocation +
             (request->query.size() > 0 ? "?" + request->query : "")
           );
@@ -730,7 +730,7 @@ export * from '{{url}}'
               {"protocol", "socket"},
               {"pathname", pathname},
               {"specifier", specifier},
-              {"bundle_identifier", bundleIdentifier}
+              {"bundle_identifier", toLowerCase(bundleIdentifier)}
             }
           );
 
@@ -838,7 +838,7 @@ export * from '{{url}}'
             #else
             "socket://" +
             #endif
-            bundleIdentifier +
+            toLowerCase(bundleIdentifier) +
             "/socket" +
             pathname
           );
@@ -1063,9 +1063,9 @@ export * from '{{url}}'
         );
 
         registration->SetAllowedOrigins(allowedOriginsCount, allowedOrigins);
-	if (entry.first != "npm") {
+        if (entry.first != "npm") {
           registration->put_HasAuthorityComponent(true);
-	}
+        }
         registration->put_TreatAsSecure(true);
         registrations[registrationsCount++] = registration.Get();
         registrationsSet.insert(registration);

diff --git a/src/ipc/scheme_handlers.cc b/src/ipc/scheme_handlers.cc
@@ -575,7 +575,8 @@ namespace SSC::IPC {
     this->absoluteURL = convertWStringToString(requestURI);
     if (
       this->absoluteURL.starts_with("socket://") &&
-      !this->absoluteURL.starts_with("socket://" + bundleIdentifier)
+      !this->absoluteURL.starts_with("socket://" + bundleIdentifier) &&
+      !this->absoluteURL.starts_with("socket://" + toLowerCase(bundleIdentifier))
     ) {
       this->absoluteURL = String("socket://") + this->absoluteURL.substr(8);
       if (this->absoluteURL.ends_with("/")) {