update location of update.xml

Author: archandatta

server/cmd/api/api/chromium.go

@@ -158,26 +158,6 @@ func (s *ApiService) UploadExtensionsAndRestart(ctx context.Context, request oap
 			return oapi.UploadExtensionsAndRestart500JSONResponse{InternalErrorJSONResponse: oapi.InternalErrorJSONResponse{Message: "failed to chown extension dir"}}, nil
 		}
 
-		// Check if the zip contains update.xml and .crx files (for policy-installed extensions)
-		// If they exist, they'll be extracted; if not, they need to be generated separately
-		updateXMLPath := filepath.Join(dest, "update.xml")
-		crxPath := filepath.Join(dest, p.name+".crx")
-		hasUpdateXML := false
-		hasCRX := false
-
-		if _, err := os.Stat(updateXMLPath); err == nil {
-			hasUpdateXML = true
-			log.Info("found update.xml in extension zip", "name", p.name)
-		}
-		if _, err := os.Stat(crxPath); err == nil {
-			hasCRX = true
-			log.Info("found .crx file in extension zip", "name", p.name)
-		}
-
-		if !hasUpdateXML || !hasCRX {
-			log.Info("extension zip missing update.xml or .crx - these files should be included for policy-installed extensions", "name", p.name, "hasUpdateXML", hasUpdateXML, "hasCRX", hasCRX)
-		}
-
 		log.Info("installed extension", "name", p.name)
 	}
 
@@ -199,6 +179,38 @@ func (s *ApiService) UploadExtensionsAndRestart(ctx context.Context, request oap
 
 		if requiresEntPolicy {
 			log.Info("extension requires enterprise policy", "name", p.name)
+
+			// Validate that update.xml and .crx files are present for policy-installed extensions
+			// These files are required for ExtensionInstallForcelist to work
+			updateXMLPath := filepath.Join(extensionPath, "update.xml")
+			hasUpdateXML := false
+			hasCRX := false
+
+			if _, err := os.Stat(updateXMLPath); err == nil {
+				hasUpdateXML = true
+				log.Info("found update.xml in extension zip", "name", p.name)
+			}
+
+			// Look for any .crx file in the directory
+			entries, err := os.ReadDir(extensionPath)
+			if err == nil {
+				for _, entry := range entries {
+					if !entry.IsDir() && filepath.Ext(entry.Name()) == ".crx" {
+						hasCRX = true
+						log.Info("found .crx file in extension zip", "name", p.name, "crx_file", entry.Name())
+						break
+					}
+				}
+			}
+
+			// Fail if policy extension is missing required files
+			if !hasUpdateXML || !hasCRX {
+				return oapi.UploadExtensionsAndRestart400JSONResponse{
+					BadRequestErrorJSONResponse: oapi.BadRequestErrorJSONResponse{
+						Message: fmt.Sprintf("extension %s requires enterprise policy (ExtensionInstallForcelist) but is missing required files: update.xml (present: %v), .crx file (present: %v). These files are required for Chrome to install the extension.", p.name, hasUpdateXML, hasCRX),
+					},
+				}, nil
+			}
 		} else {
 			// Only add --load-extension flags for non-policy extensions
 			pathsNeedingFlags = append(pathsNeedingFlags, extensionPath)

server/lib/policy/policy.go

@@ -122,8 +122,9 @@ func (p *Policy) AddExtension(extensionID, extensionPath string, requiresEnterpr
 	}
 
 	// Add the specific extension
+	// Use extension-specific update URL to support multiple policy-installed extensions
 	setting := ExtensionSetting{
-		UpdateUrl: "http://127.0.0.1:10001/update.xml",
+		UpdateUrl: fmt.Sprintf("http://127.0.0.1:10001/extensions/%s/update.xml", extensionID),
 	}
 
 	// If the extension requires enterprise policy (like webRequestBlocking),