Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

Persist network fallback and verify uv executable

Barack Sokullu439653c468ba
diff --git a/webbrain-systray/internal/app/app.go b/webbrain-systray/internal/app/app.go
index 4e08527ff..b9e70dac1 100644
--- a/webbrain-systray/internal/app/app.go
+++ b/webbrain-systray/internal/app/app.go
@@ -162,6 +162,11 @@ func (a *App) Start() error {
logx.Printf("network access: %v; listening on 127.0.0.1 only", err)
s.Network = false
err = a.Proxy.Start(a.proxyOptions(s, nil))
+ if err == nil {
+ if _, saveErr := a.Store.Update(func(saved *settings.Settings) { saved.Network = false }); saveErr != nil {
+ logx.Printf("save loopback fallback: %v", saveErr)
+ }
+ }
}
if err != nil {
return err
diff --git a/webbrain-systray/internal/app/port_test.go b/webbrain-systray/internal/app/port_test.go
index b55840d55..83a3cb6a2 100644
--- a/webbrain-systray/internal/app/port_test.go
+++ b/webbrain-systray/internal/app/port_test.go
@@ -138,6 +138,49 @@ func TestRapidNetworkTogglesApplyInRequestOrder(t *testing.T) {
}
}
+func TestNetworkRetryUsesActualListenerWhenSavedSettingIsStale(t *testing.T) {
+ gin.SetMode(gin.TestMode)
+ t.Setenv("WBC_HOME", t.TempDir())
+ if err := paths.Ensure(); err != nil {
+ t.Fatal(err)
+ }
+ store, err := settings.Open()
+ if err != nil {
+ t.Fatal(err)
+ }
+ a := New("test", store)
+ if err := a.Start(); err != nil {
+ t.Fatal(err)
+ }
+ defer a.Shutdown()
+ // Model a startup fallback whose attempt to persist Network=false failed.
+ if _, err := store.Update(func(s *settings.Settings) { s.Network = true }); err != nil {
+ t.Fatal(err)
+ }
+ e := gin.New()
+ a.routes(e)
+ r := httptest.NewRequest(http.MethodPatch, "http://127.0.0.1/companion/api/settings", strings.NewReader(`{"network":true}`))
+ r.RemoteAddr = "127.0.0.1:50000"
+ r.Header.Set("Content-Type", "application/json")
+ r.Header.Set("X-Companion-Key", store.Get().PanelToken)
+ w := httptest.NewRecorder()
+ e.ServeHTTP(w, r)
+ if w.Code != http.StatusOK {
+ t.Fatalf("settings update returned %d: %s", w.Code, w.Body.String())
+ }
+ a.queueMu.Lock()
+ done := a.queueTail
+ a.queueMu.Unlock()
+ select {
+ case <-done:
+ case <-time.After(45 * time.Second):
+ t.Fatal("network retry did not finish")
+ }
+ if got := a.Proxy.Host(); got != "0.0.0.0" {
+ t.Fatalf("stale saved network setting skipped the requested listener restart: %q", got)
+ }
+}
+
func TestConcurrentSettingsRestartsKeepProxyConfigCurrent(t *testing.T) {
t.Setenv("WBC_HOME", t.TempDir())
if err := paths.Ensure(); err != nil {
diff --git a/webbrain-systray/internal/app/routes.go b/webbrain-systray/internal/app/routes.go
index defa5df0e..509eb59e8 100644
--- a/webbrain-systray/internal/app/routes.go
+++ b/webbrain-systray/internal/app/routes.go
@@ -507,7 +507,11 @@ func (a *App) routes(e *gin.Engine) {
if req.Network != nil {
on := *req.Network
a.queueRestart("network access", func() error {
- if a.Store.Get().Network == on {
+ host := "127.0.0.1"
+ if on {
+ host = "0.0.0.0"
+ }
+ if a.Store.Get().Network == on && a.Proxy.Host() == host {
return nil
}
return a.SetNetwork(on)
diff --git a/webbrain-systray/internal/localmodel/manager.go b/webbrain-systray/internal/localmodel/manager.go
index 716a91a7e..1fd3a9a94 100644
--- a/webbrain-systray/internal/localmodel/manager.go
+++ b/webbrain-systray/internal/localmodel/manager.go
@@ -161,8 +161,28 @@ type runtimeInstallation struct {
Files []runtimeFile `json:"files"`
}
+type uvInstallation struct {
+ Archive string `json:"archive"`
+ Size int64 `json:"size"`
+ SHA256 string `json:"sha256"`
+}
+
var runtimeVerifier download.Verifier
+func fileSHA256(path string) (string, error) {
+ f, err := os.Open(path)
+ if err != nil {
+ return "", err
+ }
+ h := sha256.New()
+ _, copyErr := io.Copy(h, f)
+ closeErr := f.Close()
+ if err := errors.Join(copyErr, closeErr); err != nil {
+ return "", err
+ }
+ return hex.EncodeToString(h.Sum(nil)), nil
+}
+
// installedRuntimeManifest records the contents of the verified archives
// after extraction and macOS signing. It lets later installs repair damaged
// runtime files without downloading the unchanged model weights.
@@ -187,21 +207,15 @@ func installedRuntimeManifest(p Plan) ([]byte, error) {
if !info.Mode().IsRegular() {
return fmt.Errorf("runtime entry is not a file: %s", path)
}
- f, err := os.Open(path)
+ sha, err := fileSHA256(path)
if err != nil {
return err
}
- h := sha256.New()
- _, copyErr := io.Copy(h, f)
- closeErr := f.Close()
- if err := errors.Join(copyErr, closeErr); err != nil {
- return err
- }
rel, err := filepath.Rel(dir, path)
if err != nil {
return err
}
- installed.Files = append(installed.Files, runtimeFile{filepath.ToSlash(rel), info.Size(), hex.EncodeToString(h.Sum(nil))})
+ installed.Files = append(installed.Files, runtimeFile{filepath.ToSlash(rel), info.Size(), sha})
return nil
})
if err != nil {
@@ -249,11 +263,43 @@ func runtimeInstalled(p Plan) bool {
func uvInstalled(arch string) bool {
asset := uvAsset(arch)
pinned, ok := uvAssets[asset]
- if !ok || !fileOK(filepath.Join(uvDir(), "uv"), 0) {
+ if !ok {
+ return false
+ }
+ bin := filepath.Join(uvDir(), "uv")
+ info, err := os.Stat(bin)
+ if err != nil || !info.Mode().IsRegular() || info.Size() == 0 || (runtime.GOOS != "windows" && info.Mode().Perm()&0o111 == 0) {
return false
}
data, err := os.ReadFile(filepath.Join(uvDir(), ".installed"))
- return err == nil && string(data) == asset+" "+pinned.SHA256+"\n"
+ if err != nil {
+ return false
+ }
+ var installed uvInstallation
+ return json.Unmarshal(data, &installed) == nil &&
+ installed.Archive == asset+" "+pinned.SHA256 && installed.Size == info.Size() &&
+ len(installed.SHA256) == 64 && runtimeVerifier.Valid(bin, installed.Size, installed.SHA256)
+}
+
+func installedUVManifest(arch string) ([]byte, error) {
+ asset := uvAsset(arch)
+ pinned, ok := uvAssets[asset]
+ if !ok {
+ return nil, fmt.Errorf("no pinned SHA-256 for uv runtime %s", asset)
+ }
+ bin := filepath.Join(uvDir(), "uv")
+ info, err := os.Stat(bin)
+ if err != nil {
+ return nil, err
+ }
+ if !info.Mode().IsRegular() || info.Size() == 0 || (runtime.GOOS != "windows" && info.Mode().Perm()&0o111 == 0) {
+ return nil, errors.New("uv executable is missing or not executable")
+ }
+ sha, err := fileSHA256(bin)
+ if err != nil {
+ return nil, err
+ }
+ return json.Marshal(uvInstallation{Archive: asset + " " + pinned.SHA256, Size: info.Size(), SHA256: sha})
}
func mlxEnvironmentInstalled() bool {
@@ -568,8 +614,11 @@ func (m *Manager) installMLX(ctx context.Context, info sysinfo.Info) error {
return errors.New("uv binary missing from the archive")
}
trustMacBinaries(uvDir())
- asset := uvAsset(info.Arch)
- if err := os.WriteFile(filepath.Join(uvDir(), ".installed"), []byte(asset+" "+uvAssets[asset].SHA256+"\n"), 0o600); err != nil {
+ manifest, err := installedUVManifest(info.Arch)
+ if err != nil {
+ return fmt.Errorf("verify unpacked uv: %w", err)
+ }
+ if err := os.WriteFile(filepath.Join(uvDir(), ".installed"), manifest, 0o600); err != nil {
return err
}
_ = os.Remove(src)
diff --git a/webbrain-systray/internal/localmodel/manager_test.go b/webbrain-systray/internal/localmodel/manager_test.go
index ebec9da3a..c75dd1adb 100644
--- a/webbrain-systray/internal/localmodel/manager_test.go
+++ b/webbrain-systray/internal/localmodel/manager_test.go
@@ -256,6 +256,54 @@ func TestUVRejectsUnverifiedInstall(t *testing.T) {
}
}
+func TestUVInstalledRejectsCorruptOrNonExecutableBinary(t *testing.T) {
+ t.Setenv("WBC_HOME", t.TempDir())
+ if err := os.MkdirAll(uvDir(), 0o700); err != nil {
+ t.Fatal(err)
+ }
+ bin := filepath.Join(uvDir(), "uv")
+ if err := os.WriteFile(bin, []byte("working uv"), 0o700); err != nil {
+ t.Fatal(err)
+ }
+ manifest, err := installedUVManifest("arm64")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(filepath.Join(uvDir(), ".installed"), manifest, 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if !uvInstalled("arm64") {
+ t.Fatal("valid extracted uv executable was rejected")
+ }
+ if err := os.WriteFile(bin, []byte("Working uv"), 0o700); err != nil {
+ t.Fatal(err)
+ }
+ modified := time.Now().Add(time.Minute)
+ if err := os.Chtimes(bin, modified, modified); err != nil {
+ t.Fatal(err)
+ }
+ if uvInstalled("arm64") {
+ t.Fatal("same-sized corrupted uv executable was accepted")
+ }
+ if err := os.WriteFile(bin, []byte("working uv"), 0o700); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Chtimes(bin, modified.Add(time.Minute), modified.Add(time.Minute)); err != nil {
+ t.Fatal(err)
+ }
+ if !uvInstalled("arm64") {
+ t.Fatal("repaired uv executable was rejected")
+ }
+ if runtime.GOOS != "windows" {
+ if err := os.Chmod(bin, 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if uvInstalled("arm64") {
+ t.Fatal("uv executable without execute permission was accepted")
+ }
+ }
+}
+
func TestMLXEnvironmentRejectsStaleDependencies(t *testing.T) {
t.Setenv("WBC_HOME", t.TempDir())
bin := filepath.Join(mlxVenv(), "bin")