Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4
| @@ -8,6 +8,7 @@ import ( | |||
| 8 | 8 | "os" | |
| 9 | 9 | "os/exec" | |
| 10 | 10 | "path/filepath" | |
| 11 | + | "reflect" | |
| 11 | 12 | "runtime" | |
| 12 | 13 | "strings" | |
| 13 | 14 | "sync" | |
| @@ -16,6 +17,184 @@ import ( | |||
| 16 | 17 | "github.com/bnema/purego" | |
| 17 | 18 | ) | |
| 18 | 19 | ||
| 20 | + | // LibraryOpener opens a shared library path and returns its handle. | |
| 21 | + | type LibraryOpener func(path string) (uintptr, error) | |
| 22 | + | ||
| 23 | + | // LibraryPathResolver returns the candidate paths for a named library. | |
| 24 | + | type LibraryPathResolver func(library string) ([]string, error) | |
| 25 | + | ||
| 26 | + | // SymbolResolver resolves and publishes a symbol into target using library handles. | |
| 27 | + | type SymbolResolver func(target any, libraries []uintptr, symbol string) error | |
| 28 | + | ||
| 29 | + | // LazyResolver safely caches library opens and symbol publication. It is safe for | |
| 30 | + | // concurrent use. Its injected dependencies make resolution deterministic in tests. | |
| 31 | + | type LazyResolver struct { | |
| 32 | + | paths LibraryPathResolver | |
| 33 | + | opener LibraryOpener | |
| 34 | + | resolve SymbolResolver | |
| 35 | + | ||
| 36 | + | mu sync.Mutex | |
| 37 | + | libraries map[string]*lazyLibrary | |
| 38 | + | symbols map[lazySymbolKey]*lazySymbol | |
| 39 | + | } | |
| 40 | + | ||
| 41 | + | type lazyLibrary struct { | |
| 42 | + | once sync.Once | |
| 43 | + | handles []uintptr | |
| 44 | + | err error | |
| 45 | + | } | |
| 46 | + | ||
| 47 | + | type lazySymbolKey struct { | |
| 48 | + | library string | |
| 49 | + | symbol string | |
| 50 | + | target uintptr | |
| 51 | + | } | |
| 52 | + | ||
| 53 | + | type lazySymbol struct { | |
| 54 | + | once sync.Once | |
| 55 | + | err error | |
| 56 | + | } | |
| 57 | + | ||
| 58 | + | // NewLazyResolver constructs an isolated lazy resolver. All dependencies must | |
| 59 | + | // be non-nil. | |
| 60 | + | func NewLazyResolver(paths LibraryPathResolver, opener LibraryOpener, resolve SymbolResolver) *LazyResolver { | |
| 61 | + | if paths == nil || opener == nil || resolve == nil { | |
| 62 | + | panic("core: lazy resolver dependencies must not be nil") | |
| 63 | + | } | |
| 64 | + | return &LazyResolver{ | |
| 65 | + | paths: paths, | |
| 66 | + | opener: opener, | |
| 67 | + | resolve: resolve, | |
| 68 | + | libraries: make(map[string]*lazyLibrary), | |
| 69 | + | symbols: make(map[lazySymbolKey]*lazySymbol), | |
| 70 | + | } | |
| 71 | + | } | |
| 72 | + | ||
| 73 | + | // Register resolves and publishes symbol into target once. Library and symbol | |
| 74 | + | // failures are cached as well as successful resolutions. | |
| 75 | + | func (r *LazyResolver) Register(target any, library, symbol string) error { | |
| 76 | + | if r == nil { | |
| 77 | + | return fmt.Errorf("core: nil lazy resolver") | |
| 78 | + | } | |
| 79 | + | value := reflect.ValueOf(target) | |
| 80 | + | if !value.IsValid() || value.Kind() != reflect.Ptr || value.IsNil() { | |
| 81 | + | return fmt.Errorf("core: lazy symbol target must be a non-nil pointer") | |
| 82 | + | } | |
| 83 | + | key := lazySymbolKey{library: library, symbol: symbol, target: value.Pointer()} | |
| 84 | + | ||
| 85 | + | r.mu.Lock() | |
| 86 | + | state := r.symbols[key] | |
| 87 | + | if state == nil { | |
| 88 | + | // Generated binding tests and embedders may provide a function before | |
| 89 | + | // the first call. Do not replace that explicit implementation with a | |
| 90 | + | // symbol. Once a resolution has started, use its sync.Once rather than | |
| 91 | + | // inspecting a function that the resolver may be publishing. | |
| 92 | + | if value.Elem().Kind() == reflect.Func && !value.Elem().IsNil() { | |
| 93 | + | r.mu.Unlock() | |
| 94 | + | return nil | |
| 95 | + | } | |
| 96 | + | state = &lazySymbol{} | |
| 97 | + | r.symbols[key] = state | |
| 98 | + | } | |
| 99 | + | r.mu.Unlock() | |
| 100 | + | ||
| 101 | + | state.once.Do(func() { | |
| 102 | + | libraries, err := r.open(library) | |
| 103 | + | if err != nil { | |
| 104 | + | state.err = err | |
| 105 | + | return | |
| 106 | + | } | |
| 107 | + | state.err = r.resolve(target, libraries, symbol) | |
| 108 | + | }) | |
| 109 | + | return state.err | |
| 110 | + | } | |
| 111 | + | ||
| 112 | + | // RegisterOptional is Register for optional libraries. It reports whether the | |
| 113 | + | // symbol was published and caches an unavailable-library failure. | |
| 114 | + | func (r *LazyResolver) RegisterOptional(target any, library, symbol string) bool { | |
| 115 | + | return r.Register(target, library, symbol) == nil | |
| 116 | + | } | |
| 117 | + | ||
| 118 | + | func (r *LazyResolver) open(name string) ([]uintptr, error) { | |
| 119 | + | r.mu.Lock() | |
| 120 | + | state := r.libraries[name] | |
| 121 | + | if state == nil { | |
| 122 | + | state = &lazyLibrary{} | |
| 123 | + | r.libraries[name] = state | |
| 124 | + | } | |
| 125 | + | r.mu.Unlock() | |
| 126 | + | ||
| 127 | + | state.once.Do(func() { | |
| 128 | + | paths, err := r.paths(name) | |
| 129 | + | if err != nil { | |
| 130 | + | state.err = err | |
| 131 | + | return | |
| 132 | + | } | |
| 133 | + | if len(paths) == 0 { | |
| 134 | + | state.err = fmt.Errorf("core: no paths found for library %s", name) | |
| 135 | + | return | |
| 136 | + | } | |
| 137 | + | var lastErr error | |
| 138 | + | for _, path := range paths { | |
| 139 | + | handle, err := r.opener(path) | |
| 140 | + | if err != nil { | |
| 141 | + | lastErr = err | |
| 142 | + | continue | |
| 143 | + | } | |
| 144 | + | state.handles = append(state.handles, handle) | |
| 145 | + | } | |
| 146 | + | if len(state.handles) == 0 { | |
| 147 | + | state.err = fmt.Errorf("core: open library %s: %w", name, lastErr) | |
| 148 | + | } | |
| 149 | + | }) | |
| 150 | + | return state.handles, state.err | |
| 151 | + | } | |
| 152 | + | ||
| 153 | + | var defaultLazyResolver = NewLazyResolver( | |
| 154 | + | func(name string) ([]string, error) { | |
| 155 | + | paths := tryFindPaths(name) | |
| 156 | + | if len(paths) == 0 { | |
| 157 | + | return nil, fmt.Errorf("core: no paths found for library %s", name) | |
| 158 | + | } | |
| 159 | + | return paths, nil | |
| 160 | + | }, | |
| 161 | + | func(path string) (uintptr, error) { | |
| 162 | + | return purego.Dlopen(path, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 163 | + | }, | |
| 164 | + | func(target any, libraries []uintptr, symbol string) error { | |
| 165 | + | var lastErr error | |
| 166 | + | for _, library := range libraries { | |
| 167 | + | address, err := purego.Dlsym(library, symbol) | |
| 168 | + | if err != nil { | |
| 169 | + | lastErr = err | |
| 170 | + | continue | |
| 171 | + | } | |
| 172 | + | registerFuncSafe(target, address) | |
| 173 | + | return nil | |
| 174 | + | } | |
| 175 | + | return fmt.Errorf("core: resolve symbol %s: %w", symbol, lastErr) | |
| 176 | + | }, | |
| 177 | + | ) | |
| 178 | + | ||
| 179 | + | // LazyRegister publishes a generated function's native symbol on its first | |
| 180 | + | // call. Required-library failures panic; optional-library failures return false. | |
| 181 | + | func LazyRegister(target any, library, symbol string, optional bool) bool { | |
| 182 | + | if err := defaultLazyResolver.Register(target, library, symbol); err != nil { | |
| 183 | + | if optional { | |
| 184 | + | return false | |
| 185 | + | } | |
| 186 | + | panic(err) | |
| 187 | + | } | |
| 188 | + | return true | |
| 189 | + | } | |
| 190 | + | ||
| 191 | + | // LibraryAvailable reports whether an optional library can be opened. The open | |
| 192 | + | // result, including failure, is shared with LazyRegister. | |
| 193 | + | func LibraryAvailable(library string) bool { | |
| 194 | + | _, err := defaultLazyResolver.open(library) | |
| 195 | + | return err == nil | |
| 196 | + | } | |
| 197 | + | ||
| 19 | 198 | func PuregoSafeRegister(fptr interface{}, libs []uintptr, name string) { | |
| 20 | 199 | for _, lib := range libs { | |
| 21 | 200 | sym, err := purego.Dlsym(lib, name) | |
| @@ -53,7 +232,10 @@ var paths = map[string][]string{ | |||
| 53 | 232 | ||
| 54 | 233 | // names is a lookup from library names to shared object filenames | |
| 55 | 234 | // This is populated dynamically via SetSharedLibrary | |
| 56 | - | var names = map[string][]string{} | |
| 235 | + | var ( | |
| 236 | + | libraryConfigMu sync.RWMutex | |
| 237 | + | names = map[string][]string{} | |
| 238 | + | ) | |
| 57 | 239 | ||
| 58 | 240 | // pkgConfNames is a lookup from library names to pkg-config library names | |
| 59 | 241 | // This is populated dynamically via SetPackageName | |
| @@ -63,6 +245,8 @@ var pkgConfNames = map[string]string{} | |||
| 63 | 245 | // This is used by the code generator to set package names from GIR files. | |
| 64 | 246 | // It won't override existing entries to preserve defaults. | |
| 65 | 247 | func SetPackageName(libName, pkgName string) { | |
| 248 | + | libraryConfigMu.Lock() | |
| 249 | + | defer libraryConfigMu.Unlock() | |
| 66 | 250 | if _, exists := pkgConfNames[libName]; !exists && pkgName != "" { | |
| 67 | 251 | pkgConfNames[libName] = pkgName | |
| 68 | 252 | } | |
| @@ -72,16 +256,22 @@ func SetPackageName(libName, pkgName string) { | |||
| 72 | 256 | // This is used by the code generator to set library names from GIR files. | |
| 73 | 257 | // It won't override existing entries to preserve defaults. | |
| 74 | 258 | func SetSharedLibraries(libName string, sharedLibs []string) { | |
| 259 | + | libraryConfigMu.Lock() | |
| 260 | + | defer libraryConfigMu.Unlock() | |
| 75 | 261 | if _, exists := names[libName]; !exists && len(sharedLibs) > 0 { | |
| 76 | - | names[libName] = sharedLibs | |
| 262 | + | names[libName] = append([]string(nil), sharedLibs...) | |
| 77 | 263 | } | |
| 78 | 264 | } | |
| 79 | 265 | ||
| 80 | 266 | // findSos tries to find all shared objects from a path and a library name | |
| 81 | 267 | // It does this by mapping the library name to all suitable shared object filenames and then trying some suffixes | |
| 82 | 268 | func findSos(path string, name string) []string { | |
| 269 | + | libraryConfigMu.RLock() | |
| 270 | + | libraryNames := append([]string(nil), names[name]...) | |
| 271 | + | libraryConfigMu.RUnlock() | |
| 272 | + | ||
| 83 | 273 | sos := []string{} | |
| 84 | - | for _, n := range names[name] { | |
| 274 | + | for _, n := range libraryNames { | |
| 85 | 275 | suffixes := []string{"", ".0", ".1", ".2"} | |
| 86 | 276 | fn := filepath.Join(path, n) | |
| 87 | 277 | for _, s := range suffixes { | |
| @@ -97,7 +287,10 @@ func findSos(path string, name string) []string { | |||
| 97 | 287 | // it does this by running pkg-config --libs-only-L libname | |
| 98 | 288 | // and then it loops over the directories returned and finds all suitable ones | |
| 99 | 289 | func findPkgConf(name string) []string { | |
| 100 | - | cmd := exec.Command("pkg-config", "--libs-only-L", pkgConfNames[name]) | |
| 290 | + | libraryConfigMu.RLock() | |
| 291 | + | pkgName := pkgConfNames[name] | |
| 292 | + | libraryConfigMu.RUnlock() | |
| 293 | + | cmd := exec.Command("pkg-config", "--libs-only-L", pkgName) | |
| 101 | 294 | var out, outerr bytes.Buffer | |
| 102 | 295 | cmd.Stdout = &out | |
| 103 | 296 | cmd.Stderr = &outerr | |
| @@ -8,6 +8,7 @@ import ( | |||||
| 8 | "os" | 8 | "os" | ||
| 9 | "os/exec" | 9 | "os/exec" | ||
| 10 | "path/filepath" | 10 | "path/filepath" | ||
| 11 | + | "reflect" | |||
| 11 | "runtime" | 12 | "runtime" | ||
| 12 | "strings" | 13 | "strings" | ||
| 13 | "sync" | 14 | "sync" | ||
| @@ -16,6 +17,184 @@ import ( | |||||
| 16 | "github.com/bnema/purego" | 17 | "github.com/bnema/purego" | ||
| 17 | ) | 18 | ) | ||
| 18 | 19 | ||||
| 20 | + | // LibraryOpener opens a shared library path and returns its handle. | |||
| 21 | + | type LibraryOpener func(path string) (uintptr, error) | |||
| 22 | + | ||||
| 23 | + | // LibraryPathResolver returns the candidate paths for a named library. | |||
| 24 | + | type LibraryPathResolver func(library string) ([]string, error) | |||
| 25 | + | ||||
| 26 | + | // SymbolResolver resolves and publishes a symbol into target using library handles. | |||
| 27 | + | type SymbolResolver func(target any, libraries []uintptr, symbol string) error | |||
| 28 | + | ||||
| 29 | + | // LazyResolver safely caches library opens and symbol publication. It is safe for | |||
| 30 | + | // concurrent use. Its injected dependencies make resolution deterministic in tests. | |||
| 31 | + | type LazyResolver struct { | |||
| 32 | + | paths LibraryPathResolver | |||
| 33 | + | opener LibraryOpener | |||
| 34 | + | resolve SymbolResolver | |||
| 35 | + | ||||
| 36 | + | mu sync.Mutex | |||
| 37 | + | libraries map[string]*lazyLibrary | |||
| 38 | + | symbols map[lazySymbolKey]*lazySymbol | |||
| 39 | + | } | |||
| 40 | + | ||||
| 41 | + | type lazyLibrary struct { | |||
| 42 | + | once sync.Once | |||
| 43 | + | handles []uintptr | |||
| 44 | + | err error | |||
| 45 | + | } | |||
| 46 | + | ||||
| 47 | + | type lazySymbolKey struct { | |||
| 48 | + | library string | |||
| 49 | + | symbol string | |||
| 50 | + | target uintptr | |||
| 51 | + | } | |||
| 52 | + | ||||
| 53 | + | type lazySymbol struct { | |||
| 54 | + | once sync.Once | |||
| 55 | + | err error | |||
| 56 | + | } | |||
| 57 | + | ||||
| 58 | + | // NewLazyResolver constructs an isolated lazy resolver. All dependencies must | |||
| 59 | + | // be non-nil. | |||
| 60 | + | func NewLazyResolver(paths LibraryPathResolver, opener LibraryOpener, resolve SymbolResolver) *LazyResolver { | |||
| 61 | + | if paths == nil || opener == nil || resolve == nil { | |||
| 62 | + | panic("core: lazy resolver dependencies must not be nil") | |||
| 63 | + | } | |||
| 64 | + | return &LazyResolver{ | |||
| 65 | + | paths: paths, | |||
| 66 | + | opener: opener, | |||
| 67 | + | resolve: resolve, | |||
| 68 | + | libraries: make(map[string]*lazyLibrary), | |||
| 69 | + | symbols: make(map[lazySymbolKey]*lazySymbol), | |||
| 70 | + | } | |||
| 71 | + | } | |||
| 72 | + | ||||
| 73 | + | // Register resolves and publishes symbol into target once. Library and symbol | |||
| 74 | + | // failures are cached as well as successful resolutions. | |||
| 75 | + | func (r *LazyResolver) Register(target any, library, symbol string) error { | |||
| 76 | + | if r == nil { | |||
| 77 | + | return fmt.Errorf("core: nil lazy resolver") | |||
| 78 | + | } | |||
| 79 | + | value := reflect.ValueOf(target) | |||
| 80 | + | if !value.IsValid() || value.Kind() != reflect.Ptr || value.IsNil() { | |||
| 81 | + | return fmt.Errorf("core: lazy symbol target must be a non-nil pointer") | |||
| 82 | + | } | |||
| 83 | + | key := lazySymbolKey{library: library, symbol: symbol, target: value.Pointer()} | |||
| 84 | + | ||||
| 85 | + | r.mu.Lock() | |||
| 86 | + | state := r.symbols[key] | |||
| 87 | + | if state == nil { | |||
| 88 | + | // Generated binding tests and embedders may provide a function before | |||
| 89 | + | // the first call. Do not replace that explicit implementation with a | |||
| 90 | + | // symbol. Once a resolution has started, use its sync.Once rather than | |||
| 91 | + | // inspecting a function that the resolver may be publishing. | |||
| 92 | + | if value.Elem().Kind() == reflect.Func && !value.Elem().IsNil() { | |||
| 93 | + | r.mu.Unlock() | |||
| 94 | + | return nil | |||
| 95 | + | } | |||
| 96 | + | state = &lazySymbol{} | |||
| 97 | + | r.symbols[key] = state | |||
| 98 | + | } | |||
| 99 | + | r.mu.Unlock() | |||
| 100 | + | ||||
| 101 | + | state.once.Do(func() { | |||
| 102 | + | libraries, err := r.open(library) | |||
| 103 | + | if err != nil { | |||
| 104 | + | state.err = err | |||
| 105 | + | return | |||
| 106 | + | } | |||
| 107 | + | state.err = r.resolve(target, libraries, symbol) | |||
| 108 | + | }) | |||
| 109 | + | return state.err | |||
| 110 | + | } | |||
| 111 | + | ||||
| 112 | + | // RegisterOptional is Register for optional libraries. It reports whether the | |||
| 113 | + | // symbol was published and caches an unavailable-library failure. | |||
| 114 | + | func (r *LazyResolver) RegisterOptional(target any, library, symbol string) bool { | |||
| 115 | + | return r.Register(target, library, symbol) == nil | |||
| 116 | + | } | |||
| 117 | + | ||||
| 118 | + | func (r *LazyResolver) open(name string) ([]uintptr, error) { | |||
| 119 | + | r.mu.Lock() | |||
| 120 | + | state := r.libraries[name] | |||
| 121 | + | if state == nil { | |||
| 122 | + | state = &lazyLibrary{} | |||
| 123 | + | r.libraries[name] = state | |||
| 124 | + | } | |||
| 125 | + | r.mu.Unlock() | |||
| 126 | + | ||||
| 127 | + | state.once.Do(func() { | |||
| 128 | + | paths, err := r.paths(name) | |||
| 129 | + | if err != nil { | |||
| 130 | + | state.err = err | |||
| 131 | + | return | |||
| 132 | + | } | |||
| 133 | + | if len(paths) == 0 { | |||
| 134 | + | state.err = fmt.Errorf("core: no paths found for library %s", name) | |||
| 135 | + | return | |||
| 136 | + | } | |||
| 137 | + | var lastErr error | |||
| 138 | + | for _, path := range paths { | |||
| 139 | + | handle, err := r.opener(path) | |||
| 140 | + | if err != nil { | |||
| 141 | + | lastErr = err | |||
| 142 | + | continue | |||
| 143 | + | } | |||
| 144 | + | state.handles = append(state.handles, handle) | |||
| 145 | + | } | |||
| 146 | + | if len(state.handles) == 0 { | |||
| 147 | + | state.err = fmt.Errorf("core: open library %s: %w", name, lastErr) | |||
| 148 | + | } | |||
| 149 | + | }) | |||
| 150 | + | return state.handles, state.err | |||
| 151 | + | } | |||
| 152 | + | ||||
| 153 | + | var defaultLazyResolver = NewLazyResolver( | |||
| 154 | + | func(name string) ([]string, error) { | |||
| 155 | + | paths := tryFindPaths(name) | |||
| 156 | + | if len(paths) == 0 { | |||
| 157 | + | return nil, fmt.Errorf("core: no paths found for library %s", name) | |||
| 158 | + | } | |||
| 159 | + | return paths, nil | |||
| 160 | + | }, | |||
| 161 | + | func(path string) (uintptr, error) { | |||
| 162 | + | return purego.Dlopen(path, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 163 | + | }, | |||
| 164 | + | func(target any, libraries []uintptr, symbol string) error { | |||
| 165 | + | var lastErr error | |||
| 166 | + | for _, library := range libraries { | |||
| 167 | + | address, err := purego.Dlsym(library, symbol) | |||
| 168 | + | if err != nil { | |||
| 169 | + | lastErr = err | |||
| 170 | + | continue | |||
| 171 | + | } | |||
| 172 | + | registerFuncSafe(target, address) | |||
| 173 | + | return nil | |||
| 174 | + | } | |||
| 175 | + | return fmt.Errorf("core: resolve symbol %s: %w", symbol, lastErr) | |||
| 176 | + | }, | |||
| 177 | + | ) | |||
| 178 | + | ||||
| 179 | + | // LazyRegister publishes a generated function's native symbol on its first | |||
| 180 | + | // call. Required-library failures panic; optional-library failures return false. | |||
| 181 | + | func LazyRegister(target any, library, symbol string, optional bool) bool { | |||
| 182 | + | if err := defaultLazyResolver.Register(target, library, symbol); err != nil { | |||
| 183 | + | if optional { | |||
| 184 | + | return false | |||
| 185 | + | } | |||
| 186 | + | panic(err) | |||
| 187 | + | } | |||
| 188 | + | return true | |||
| 189 | + | } | |||
| 190 | + | ||||
| 191 | + | // LibraryAvailable reports whether an optional library can be opened. The open | |||
| 192 | + | // result, including failure, is shared with LazyRegister. | |||
| 193 | + | func LibraryAvailable(library string) bool { | |||
| 194 | + | _, err := defaultLazyResolver.open(library) | |||
| 195 | + | return err == nil | |||
| 196 | + | } | |||
| 197 | + | ||||
| 19 | func PuregoSafeRegister(fptr interface{}, libs []uintptr, name string) { | 198 | func PuregoSafeRegister(fptr interface{}, libs []uintptr, name string) { | ||
| 20 | for _, lib := range libs { | 199 | for _, lib := range libs { | ||
| 21 | sym, err := purego.Dlsym(lib, name) | 200 | sym, err := purego.Dlsym(lib, name) | ||
| @@ -53,7 +232,10 @@ var paths = map[string][]string{ | |||||
| 53 | 232 | ||||
| 54 | // names is a lookup from library names to shared object filenames | 233 | // names is a lookup from library names to shared object filenames | ||
| 55 | // This is populated dynamically via SetSharedLibrary | 234 | // This is populated dynamically via SetSharedLibrary | ||
| 56 | - | var names = map[string][]string{} | 235 | + | var ( |
| 236 | + | libraryConfigMu sync.RWMutex | |||
| 237 | + | names = map[string][]string{} | |||
| 238 | + | ) | |||
| 57 | 239 | ||||
| 58 | // pkgConfNames is a lookup from library names to pkg-config library names | 240 | // pkgConfNames is a lookup from library names to pkg-config library names | ||
| 59 | // This is populated dynamically via SetPackageName | 241 | // This is populated dynamically via SetPackageName | ||
| @@ -63,6 +245,8 @@ var pkgConfNames = map[string]string{} | |||||
| 63 | // This is used by the code generator to set package names from GIR files. | 245 | // This is used by the code generator to set package names from GIR files. | ||
| 64 | // It won't override existing entries to preserve defaults. | 246 | // It won't override existing entries to preserve defaults. | ||
| 65 | func SetPackageName(libName, pkgName string) { | 247 | func SetPackageName(libName, pkgName string) { | ||
| 248 | + | libraryConfigMu.Lock() | |||
| 249 | + | defer libraryConfigMu.Unlock() | |||
| 66 | if _, exists := pkgConfNames[libName]; !exists && pkgName != "" { | 250 | if _, exists := pkgConfNames[libName]; !exists && pkgName != "" { | ||
| 67 | pkgConfNames[libName] = pkgName | 251 | pkgConfNames[libName] = pkgName | ||
| 68 | } | 252 | } | ||
| @@ -72,16 +256,22 @@ func SetPackageName(libName, pkgName string) { | |||||
| 72 | // This is used by the code generator to set library names from GIR files. | 256 | // This is used by the code generator to set library names from GIR files. | ||
| 73 | // It won't override existing entries to preserve defaults. | 257 | // It won't override existing entries to preserve defaults. | ||
| 74 | func SetSharedLibraries(libName string, sharedLibs []string) { | 258 | func SetSharedLibraries(libName string, sharedLibs []string) { | ||
| 259 | + | libraryConfigMu.Lock() | |||
| 260 | + | defer libraryConfigMu.Unlock() | |||
| 75 | if _, exists := names[libName]; !exists && len(sharedLibs) > 0 { | 261 | if _, exists := names[libName]; !exists && len(sharedLibs) > 0 { | ||
| 76 | - | names[libName] = sharedLibs | 262 | + | names[libName] = append([]string(nil), sharedLibs...) |
| 77 | } | 263 | } | ||
| 78 | } | 264 | } | ||
| 79 | 265 | ||||
| 80 | // findSos tries to find all shared objects from a path and a library name | 266 | // findSos tries to find all shared objects from a path and a library name | ||
| 81 | // It does this by mapping the library name to all suitable shared object filenames and then trying some suffixes | 267 | // It does this by mapping the library name to all suitable shared object filenames and then trying some suffixes | ||
| 82 | func findSos(path string, name string) []string { | 268 | func findSos(path string, name string) []string { | ||
| 269 | + | libraryConfigMu.RLock() | |||
| 270 | + | libraryNames := append([]string(nil), names[name]...) | |||
| 271 | + | libraryConfigMu.RUnlock() | |||
| 272 | + | ||||
| 83 | sos := []string{} | 273 | sos := []string{} | ||
| 84 | - | for _, n := range names[name] { | 274 | + | for _, n := range libraryNames { |
| 85 | suffixes := []string{"", ".0", ".1", ".2"} | 275 | suffixes := []string{"", ".0", ".1", ".2"} | ||
| 86 | fn := filepath.Join(path, n) | 276 | fn := filepath.Join(path, n) | ||
| 87 | for _, s := range suffixes { | 277 | for _, s := range suffixes { | ||
| @@ -97,7 +287,10 @@ func findSos(path string, name string) []string { | |||||
| 97 | // it does this by running pkg-config --libs-only-L libname | 287 | // it does this by running pkg-config --libs-only-L libname | ||
| 98 | // and then it loops over the directories returned and finds all suitable ones | 288 | // and then it loops over the directories returned and finds all suitable ones | ||
| 99 | func findPkgConf(name string) []string { | 289 | func findPkgConf(name string) []string { | ||
| 100 | - | cmd := exec.Command("pkg-config", "--libs-only-L", pkgConfNames[name]) | 290 | + | libraryConfigMu.RLock() |
| 291 | + | pkgName := pkgConfNames[name] | |||
| 292 | + | libraryConfigMu.RUnlock() | |||
| 293 | + | cmd := exec.Command("pkg-config", "--libs-only-L", pkgName) | |||
| 101 | var out, outerr bytes.Buffer | 294 | var out, outerr bytes.Buffer | ||
| 102 | cmd.Stdout = &out | 295 | cmd.Stdout = &out | ||
| 103 | cmd.Stderr = &outerr | 296 | cmd.Stderr = &outerr | ||