Add gradual extension upload endpoint

Author: rgarcia

server/cmd/api/api/chromium.go

@@ -34,10 +34,31 @@ const (
 	extensionsBaseDir = "/home/kernel/extensions"
 )
 
-// UploadExtensionsAndRestart handles multipart upload of one or more extension zips and extracts
-// them under /home/kernel/extensions/<name>. Unpacked extensions are loaded immediately over CDP;
-// extensions that require enterprise policy restart Chromium after their policy is installed.
+// UploadExtensionsAndRestart uploads extensions and always restarts Chromium.
 func (s *ApiService) UploadExtensionsAndRestart(ctx context.Context, request oapi.UploadExtensionsAndRestartRequestObject) (oapi.UploadExtensionsAndRestartResponseObject, error) {
+	return s.uploadExtensions(ctx, request, true)
+}
+
+// UploadExtensions uploads extensions and activates ordinary unpacked extensions over CDP.
+func (s *ApiService) UploadExtensions(ctx context.Context, request oapi.UploadExtensionsRequestObject) (oapi.UploadExtensionsResponseObject, error) {
+	response, err := s.uploadExtensions(ctx, oapi.UploadExtensionsAndRestartRequestObject{Body: request.Body}, false)
+	if err != nil {
+		return nil, err
+	}
+
+	switch response := response.(type) {
+	case oapi.UploadExtensionsAndRestart201Response:
+		return oapi.UploadExtensions201Response{}, nil
+	case oapi.UploadExtensionsAndRestart400JSONResponse:
+		return oapi.UploadExtensions400JSONResponse{BadRequestErrorJSONResponse: response.BadRequestErrorJSONResponse}, nil
+	case oapi.UploadExtensionsAndRestart500JSONResponse:
+		return oapi.UploadExtensions500JSONResponse{InternalErrorJSONResponse: response.InternalErrorJSONResponse}, nil
+	default:
+		return oapi.UploadExtensions500JSONResponse{InternalErrorJSONResponse: oapi.InternalErrorJSONResponse{Message: "internal error"}}, nil
+	}
+}
+
+func (s *ApiService) uploadExtensions(ctx context.Context, request oapi.UploadExtensionsAndRestartRequestObject, forceRestart bool) (oapi.UploadExtensionsAndRestartResponseObject, error) {
 	log := logger.FromContext(ctx)
 	start := time.Now()
 	log.Info("upload extensions: begin")
@@ -159,7 +180,8 @@ func (s *ApiService) UploadExtensionsAndRestart(ctx context.Context, request oap
 		return oapi.UploadExtensionsAndRestart500JSONResponse{InternalErrorJSONResponse: oapi.InternalErrorJSONResponse{Message: err.Error()}}, nil
 	}
 
-	if requiresRestart {
+	restarted := forceRestart || requiresRestart
+	if restarted {
 		if err := s.restartChromiumAndWait(ctx, "extension upload"); err != nil {
 			return oapi.UploadExtensionsAndRestart500JSONResponse{
 				InternalErrorJSONResponse: oapi.InternalErrorJSONResponse{Message: err.Error()},
@@ -174,10 +196,10 @@ func (s *ApiService) UploadExtensionsAndRestart(ctx context.Context, request oap
 				},
 			}, nil
 		}
-		requiresRestart = true
+		restarted = true
 	}
 
-	log.Info("extensions ready", "restarted", requiresRestart, "elapsed", time.Since(start).String())
+	log.Info("extensions ready", "restarted", restarted, "elapsed", time.Since(start).String())
 	return oapi.UploadExtensionsAndRestart201Response{}, nil
 }
 

server/e2e/e2e_chromium_test.go

@@ -278,11 +278,11 @@ func TestExtensionUploadAndActivation(t *testing.T) {
 		err = w.Close()
 		require.NoError(t, err)
 		start := time.Now()
-		rsp, err := client.UploadExtensionsAndRestartWithBodyWithResponse(ctx, w.FormDataContentType(), &body)
+		rsp, err := client.UploadExtensionsWithBodyWithResponse(ctx, w.FormDataContentType(), &body)
 		elapsed := time.Since(start)
-		require.NoError(t, err, "uploadExtensionsAndRestart request error")
+		require.NoError(t, err, "uploadExtensions request error")
 		require.Equal(t, http.StatusCreated, rsp.StatusCode(), "unexpected status: %s body=%s", rsp.Status(), string(rsp.Body))
-		t.Logf("/chromium/upload-extensions-and-restart completed in %s (%d ms)", elapsed.String(), elapsed.Milliseconds())
+		t.Logf("/chromium/upload-extensions completed in %s (%d ms)", elapsed.String(), elapsed.Milliseconds())
 	}
 
 	browserWebSocketAfter, err := cdpclient.BrowserWebSocketURL(ctx, versionURL)
@@ -302,6 +302,28 @@ func TestExtensionUploadAndActivation(t *testing.T) {
 		out, err := cmd.CombinedOutput()
 		require.NoError(t, err, "title verify failed: %v output=%s", err, string(out))
 	}
+
+	// The legacy endpoint retains its unconditional restart behavior.
+	{
+		client, err := c.APIClient()
+		require.NoError(t, err)
+		var body bytes.Buffer
+		w := multipart.NewWriter(&body)
+		fw, err := w.CreateFormFile("extensions.zip_file", "ext.zip")
+		require.NoError(t, err)
+		_, err = io.Copy(fw, bytes.NewReader(extZip))
+		require.NoError(t, err)
+		require.NoError(t, w.WriteField("extensions.name", "restart-testext"))
+		require.NoError(t, w.Close())
+
+		rsp, err := client.UploadExtensionsAndRestartWithBodyWithResponse(ctx, w.FormDataContentType(), &body)
+		require.NoError(t, err, "uploadExtensionsAndRestart request error")
+		require.Equal(t, http.StatusCreated, rsp.StatusCode(), "unexpected status: %s body=%s", rsp.Status(), string(rsp.Body))
+	}
+
+	browserWebSocketAfterRestart, err := cdpclient.BrowserWebSocketURL(ctx, versionURL)
+	require.NoError(t, err, "get browser WebSocket URL after legacy extension upload")
+	require.NotEqual(t, browserWebSocketAfter, browserWebSocketAfterRestart, "legacy endpoint did not restart Chromium")
 }
 
 func TestScreenshotHeadless(t *testing.T) {