mirror of
https://github.com/git-pkgs/proxy.git
synced 2026-07-06 22:33:19 -04:00
Compare commits
68 commits
enforce-ma
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95318dedff |
||
|
|
b45757ea86 |
||
|
|
a8c0562c97 |
||
|
|
81d19b7632 |
||
|
|
7888296193 |
||
|
|
787b76dfe7 | ||
|
|
bb214bb7b2 |
||
|
|
f4a8c5606a |
||
|
|
ca2514991d |
||
|
|
b2011c0a54 |
||
|
|
795edb4f91 |
||
|
|
e289faed06 |
||
|
|
8aa6d758a8 |
||
|
|
22c9df6374 |
||
|
|
d968f4ad47 |
||
|
|
fc245fd975 |
||
|
|
50ea557ce8 |
||
|
|
cb18df5bac |
||
|
|
8c28b02035 |
||
|
|
da4fa2fc98 |
||
|
|
08d975c397 |
||
|
|
94ba4aba41 |
||
|
|
fbe82f3605 |
||
|
|
67190c1a8e |
||
|
|
31b513538f |
||
|
|
e5fbd6ef69 |
||
|
|
6fa2d95f73 |
||
|
|
0e7af4aed6 |
||
|
|
65474c77e8 |
||
|
|
946d39f193 |
||
|
|
ee57878386 |
||
|
|
00b032cb5b |
||
|
|
552c8ac4e5 |
||
|
|
76f41cf271 |
||
|
|
a8b6b0a417 |
||
|
|
1e6a0d1ab8 |
||
|
|
d39e312710 |
||
|
|
7586beb37b |
||
|
|
7832db2adb |
||
|
|
497e16f90b |
||
|
|
e8363e2fec |
||
|
|
ffd28ad856 |
||
|
|
17a10bda55 |
||
|
|
f2a5b704f0 |
||
|
|
5315883c3b |
||
|
|
ebc2ea9cf9 |
||
|
|
992f5c68a7 |
||
|
|
31a9ca75b2 |
||
|
|
61741123bf |
||
|
|
8d2740624f |
||
|
|
e912227e3b |
||
|
|
522c6f233e |
||
|
|
a4fd333d48 |
||
|
|
adca293269 |
||
|
|
71e8d3b9eb |
||
|
|
d6066af230 |
||
|
|
cfcf480f69 |
||
|
|
f1ea8b50a1 |
||
|
|
e2495ef0aa |
||
|
|
fd9b8da526 |
||
|
|
33e3a1a197 |
||
|
|
78e1e76129 |
||
|
|
96049c1f88 |
||
|
|
3a68ccef3e |
||
|
|
4c53c77092 |
||
|
|
f9f2a6ecd4 |
||
|
|
1ad182782d |
||
|
|
c73b0a35a1 |
90 changed files with 6172 additions and 1314 deletions
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
|
@ -17,12 +17,12 @@ jobs:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go-version }}
|
go-version: ${{ matrix.go-version }}
|
||||||
|
|
||||||
|
|
@ -35,12 +35,12 @@ jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
|
||||||
with:
|
with:
|
||||||
go-version: '1.25'
|
go-version: '1.25'
|
||||||
|
|
||||||
|
|
|
||||||
8
.github/workflows/publish.yml
vendored
8
.github/workflows/publish.yml
vendored
|
|
@ -20,12 +20,12 @@ jobs:
|
||||||
contents: read
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repo
|
- name: Check out the repo
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Log in to the Container registry
|
- name: Log in to the Container registry
|
||||||
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121
|
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
|
|
@ -33,12 +33,12 @@ jobs:
|
||||||
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf
|
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9
|
||||||
with:
|
with:
|
||||||
images: ghcr.io/${{ github.repository }}
|
images: ghcr.io/${{ github.repository }}
|
||||||
|
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f
|
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
|
|
||||||
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
|
|
@ -14,20 +14,20 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1
|
- uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
|
||||||
with:
|
with:
|
||||||
go-version-file: go.mod
|
go-version-file: go.mod
|
||||||
cache: false
|
cache: false
|
||||||
|
|
||||||
- uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
|
- uses: goreleaser/goreleaser-action@5daf1e915a5f0af01ddbcd89a43b8061ff4f1a89 # v7.2.2
|
||||||
with:
|
with:
|
||||||
version: "~> v2"
|
version: "~> v2"
|
||||||
args: release --clean
|
args: release --clean
|
||||||
|
|
|
||||||
4
.github/workflows/swagger.yml
vendored
4
.github/workflows/swagger.yml
vendored
|
|
@ -12,12 +12,12 @@ jobs:
|
||||||
swagger:
|
swagger:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
|
||||||
with:
|
with:
|
||||||
go-version: '1.25'
|
go-version: '1.25'
|
||||||
|
|
||||||
|
|
|
||||||
4
.github/workflows/zizmor.yml
vendored
4
.github/workflows/zizmor.yml
vendored
|
|
@ -21,9 +21,9 @@ jobs:
|
||||||
security-events: write
|
security-events: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Run zizmor
|
- name: Run zizmor
|
||||||
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
|
uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
|
||||||
|
|
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -14,8 +14,8 @@ proxy
|
||||||
coverage.html
|
coverage.html
|
||||||
coverage.txt
|
coverage.txt
|
||||||
|
|
||||||
# Dependency directories
|
# Go vendor directory (repo root only; embedded UI vendor dirs are tracked)
|
||||||
vendor/
|
/vendor/
|
||||||
|
|
||||||
# Go workspace file
|
# Go workspace file
|
||||||
go.work
|
go.work
|
||||||
|
|
|
||||||
28
.golangci.yml
Normal file
28
.golangci.yml
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
version: "2"
|
||||||
|
|
||||||
|
linters:
|
||||||
|
enable:
|
||||||
|
- gocritic
|
||||||
|
- gocognit
|
||||||
|
- gocyclo
|
||||||
|
- maintidx
|
||||||
|
- dupl
|
||||||
|
- mnd
|
||||||
|
- unparam
|
||||||
|
- ireturn
|
||||||
|
- goconst
|
||||||
|
- errcheck
|
||||||
|
settings:
|
||||||
|
goconst:
|
||||||
|
min-len: 4
|
||||||
|
min-occurrences: 5
|
||||||
|
ignore-tests: true
|
||||||
|
ignore-string-values:
|
||||||
|
- "^[a-z]+$"
|
||||||
|
exclusions:
|
||||||
|
rules:
|
||||||
|
- path: _test\.go
|
||||||
|
linters:
|
||||||
|
- goconst
|
||||||
|
- dupl
|
||||||
|
- mnd
|
||||||
|
|
@ -36,11 +36,10 @@ checksum:
|
||||||
|
|
||||||
signs:
|
signs:
|
||||||
- cmd: cosign
|
- cmd: cosign
|
||||||
certificate: "${artifact}.pem"
|
signature: "${artifact}.cosign.bundle"
|
||||||
args:
|
args:
|
||||||
- sign-blob
|
- sign-blob
|
||||||
- "--output-certificate=${certificate}"
|
- "--bundle=${signature}"
|
||||||
- "--output-signature=${signature}"
|
|
||||||
- "${artifact}"
|
- "${artifact}"
|
||||||
- "--yes"
|
- "--yes"
|
||||||
artifacts: checksum
|
artifacts: checksum
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.25-alpine AS builder
|
FROM golang:1.26.4-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
|
|
@ -15,7 +15,7 @@ COPY . .
|
||||||
# Build the binary
|
# Build the binary
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /proxy ./cmd/proxy
|
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /proxy ./cmd/proxy
|
||||||
|
|
||||||
FROM alpine:3.21
|
FROM alpine:3.24.1
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates
|
RUN apk add --no-cache ca-certificates
|
||||||
|
|
||||||
|
|
|
||||||
117
README.md
117
README.md
|
|
@ -32,11 +32,13 @@ Resolution order: package override, then ecosystem override, then global default
|
||||||
| pub.dev | Dart | Yes | ✓ |
|
| pub.dev | Dart | Yes | ✓ |
|
||||||
| PyPI | Python | Yes | ✓ |
|
| PyPI | Python | Yes | ✓ |
|
||||||
| Maven | Java | | ✓ |
|
| Maven | Java | | ✓ |
|
||||||
|
| Gradle Build Cache | Java/Kotlin | | ✓ |
|
||||||
| NuGet | .NET | Yes | ✓ |
|
| NuGet | .NET | Yes | ✓ |
|
||||||
| Composer | PHP | Yes | ✓ |
|
| Composer | PHP | Yes | ✓ |
|
||||||
| Conan | C/C++ | | ✓ |
|
| Conan | C/C++ | | ✓ |
|
||||||
| Conda | Python/R | Yes | ✓ |
|
| Conda | Python/R | Yes | ✓ |
|
||||||
| CRAN | R | | ✓ |
|
| CRAN | R | | ✓ |
|
||||||
|
| Julia | Julia | | ✓ |
|
||||||
| Container | Docker/OCI | | ✓ |
|
| Container | Docker/OCI | | ✓ |
|
||||||
| Debian | Debian/Ubuntu | | ✓ |
|
| Debian | Debian/Ubuntu | | ✓ |
|
||||||
| RPM | RHEL/Fedora | | ✓ |
|
| RPM | RHEL/Fedora | | ✓ |
|
||||||
|
|
@ -208,6 +210,34 @@ Add to your `~/.m2/settings.xml`:
|
||||||
</settings>
|
</settings>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The `/maven/` endpoint uses Maven Central as primary upstream and falls back to the Gradle Plugin Portal for Gradle plugin marker metadata and related artifacts when the primary upstream returns not found.
|
||||||
|
|
||||||
|
For Gradle plugin resolution via the same proxy endpoint:
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
maven(url = "http://localhost:8080/maven/")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Gradle HTTP Build Cache
|
||||||
|
|
||||||
|
Configure in `settings.gradle(.kts)`:
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
buildCache {
|
||||||
|
local {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
remote<HttpBuildCache> {
|
||||||
|
url = uri("http://localhost:8080/gradle/")
|
||||||
|
push = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
### NuGet
|
### NuGet
|
||||||
|
|
||||||
Configure in `nuget.config`:
|
Configure in `nuget.config`:
|
||||||
|
|
@ -295,6 +325,21 @@ local({
|
||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Julia
|
||||||
|
|
||||||
|
Set the Pkg server before starting Julia:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
export JULIA_PKG_SERVER=http://localhost:8080/julia
|
||||||
|
```
|
||||||
|
|
||||||
|
Or inside a running session:
|
||||||
|
|
||||||
|
```julia
|
||||||
|
ENV["JULIA_PKG_SERVER"] = "http://localhost:8080/julia"
|
||||||
|
using Pkg; Pkg.update()
|
||||||
|
```
|
||||||
|
|
||||||
### Docker / Container Registry
|
### Docker / Container Registry
|
||||||
|
|
||||||
Configure Docker to use the proxy as a registry mirror in `/etc/docker/daemon.json`:
|
Configure Docker to use the proxy as a registry mirror in `/etc/docker/daemon.json`:
|
||||||
|
|
@ -353,6 +398,7 @@ sudo dnf update
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
The proxy can be configured via:
|
The proxy can be configured via:
|
||||||
|
|
||||||
1. Command line flags (highest priority)
|
1. Command line flags (highest priority)
|
||||||
2. Environment variables
|
2. Environment variables
|
||||||
3. Configuration file (YAML or JSON)
|
3. Configuration file (YAML or JSON)
|
||||||
|
|
@ -378,6 +424,7 @@ The proxy can be configured via:
|
||||||
```bash
|
```bash
|
||||||
PROXY_LISTEN=:8080
|
PROXY_LISTEN=:8080
|
||||||
PROXY_BASE_URL=http://localhost:8080
|
PROXY_BASE_URL=http://localhost:8080
|
||||||
|
PROXY_UI_URL=http://localhost:8080 # Optional; defaults to PROXY_BASE_URL
|
||||||
PROXY_STORAGE_URL=file:///var/cache/proxy/artifacts
|
PROXY_STORAGE_URL=file:///var/cache/proxy/artifacts
|
||||||
PROXY_DATABASE_DRIVER=sqlite
|
PROXY_DATABASE_DRIVER=sqlite
|
||||||
PROXY_DATABASE_PATH=./cache/proxy.db
|
PROXY_DATABASE_PATH=./cache/proxy.db
|
||||||
|
|
@ -560,7 +607,7 @@ Recently cached:
|
||||||
| Endpoint | Description |
|
| Endpoint | Description |
|
||||||
|----------|-------------|
|
|----------|-------------|
|
||||||
| `GET /` | Dashboard (web UI) |
|
| `GET /` | Dashboard (web UI) |
|
||||||
| `GET /health` | Health check (returns "ok" if healthy) |
|
| `GET /health` | Health check (JSON; HTTP 200 healthy, 503 unhealthy) |
|
||||||
| `GET /stats` | Cache statistics (JSON) |
|
| `GET /stats` | Cache statistics (JSON) |
|
||||||
| `GET /metrics` | Prometheus metrics |
|
| `GET /metrics` | Prometheus metrics |
|
||||||
| `GET /npm/*` | npm registry protocol |
|
| `GET /npm/*` | npm registry protocol |
|
||||||
|
|
@ -576,6 +623,7 @@ Recently cached:
|
||||||
| `GET /conan/*` | Conan C/C++ protocol |
|
| `GET /conan/*` | Conan C/C++ protocol |
|
||||||
| `GET /conda/*` | Conda/Anaconda protocol |
|
| `GET /conda/*` | Conda/Anaconda protocol |
|
||||||
| `GET /cran/*` | CRAN (R) protocol |
|
| `GET /cran/*` | CRAN (R) protocol |
|
||||||
|
| `GET /julia/*` | Julia Pkg server protocol |
|
||||||
| `GET /v2/*` | OCI/Docker registry protocol |
|
| `GET /v2/*` | OCI/Docker registry protocol |
|
||||||
| `GET /debian/*` | Debian/APT repository protocol |
|
| `GET /debian/*` | Debian/APT repository protocol |
|
||||||
| `GET /rpm/*` | RPM/Yum repository protocol |
|
| `GET /rpm/*` | RPM/Yum repository protocol |
|
||||||
|
|
@ -772,16 +820,16 @@ Response:
|
||||||
|
|
||||||
## Web Interface
|
## Web Interface
|
||||||
|
|
||||||
The proxy serves a web UI at the root URL. No separate frontend build is needed -- templates and assets are embedded in the binary.
|
The proxy serves a web UI under `/ui`. No separate frontend build is needed -- templates and assets are embedded in the binary. `GET /` redirects to `/ui/`. The UI is mounted under its own prefix so a reverse proxy can apply different access rules to it than to the package endpoints (for example, requiring auth for `PathPrefix(/ui)` while leaving `/npm`, `/pypi` etc. open to build machines).
|
||||||
|
|
||||||
- **Dashboard** (`/`) -- cache stats, popular packages, recently cached artifacts, and vulnerability overview.
|
- **Dashboard** (`/ui/`) -- cache stats, popular packages, recently cached artifacts, and vulnerability overview.
|
||||||
- **Install guide** (`/install`) -- per-ecosystem configuration instructions, so you don't have to look them up here.
|
- **Install guide** (`/ui/install`) -- per-ecosystem configuration instructions, so you don't have to look them up here.
|
||||||
- **Package browser** (`/packages`) -- browse all cached packages with filtering by ecosystem and sorting by hits, size, name, or vulnerability count.
|
- **Package browser** (`/ui/packages`) -- browse all cached packages with filtering by ecosystem and sorting by hits, size, name, or vulnerability count.
|
||||||
- **Search** (`/search?q=...`) -- search cached packages by name.
|
- **Search** (`/ui/search?q=...`) -- search cached packages by name.
|
||||||
- **Package detail** (`/package/{ecosystem}/{name}`) -- metadata, license, vulnerabilities, and version list for a package. You can select two versions to compare.
|
- **Package detail** (`/ui/package/{ecosystem}/{name}`) -- metadata, license, vulnerabilities, and version list for a package. You can select two versions to compare.
|
||||||
- **Version detail** (`/package/{ecosystem}/{name}/{version}`) -- per-version metadata, integrity hash, artifact cache status, and hit counts.
|
- **Version detail** (`/ui/package/{ecosystem}/{name}/{version}`) -- per-version metadata, integrity hash, artifact cache status, and hit counts.
|
||||||
- **Source browser** (`/package/{ecosystem}/{name}/{version}/browse`) -- browse files inside cached archives with syntax highlighting for text files and image previews.
|
- **Source browser** (`/ui/package/{ecosystem}/{name}/{version}/browse`) -- browse files inside cached archives with syntax highlighting for text files and image previews.
|
||||||
- **Version diff** (`/package/{ecosystem}/{name}/compare/{v1}...{v2}`) -- side-by-side diff of two cached versions showing added, removed, and changed files.
|
- **Version diff** (`/ui/package/{ecosystem}/{name}/compare/{v1}...{v2}`) -- side-by-side diff of two cached versions showing added, removed, and changed files.
|
||||||
|
|
||||||
## Monitoring
|
## Monitoring
|
||||||
|
|
||||||
|
|
@ -798,9 +846,28 @@ The proxy exposes Prometheus metrics at `GET /metrics`. All metric names are pre
|
||||||
| `proxy_storage_operation_duration_seconds` | histogram | `operation` | Storage read/write latency |
|
| `proxy_storage_operation_duration_seconds` | histogram | `operation` | Storage read/write latency |
|
||||||
| `proxy_storage_errors_total` | counter | `operation` | Storage read/write failures |
|
| `proxy_storage_errors_total` | counter | `operation` | Storage read/write failures |
|
||||||
| `proxy_active_requests` | gauge | | In-flight requests |
|
| `proxy_active_requests` | gauge | | In-flight requests |
|
||||||
|
| `proxy_health_probe_failures_total` | counter | `step` | Storage health probe failures by failing step (`write`, `size`, `read`, `verify`, `delete`). |
|
||||||
|
|
||||||
Cache size and artifact count are refreshed every 60 seconds. The remaining metrics update on each request.
|
Cache size and artifact count are refreshed every 60 seconds. The remaining metrics update on each request.
|
||||||
|
|
||||||
|
### Health Check
|
||||||
|
|
||||||
|
`/health` returns a structured JSON report of subsystem health. HTTP 200 if all checks pass; 503 if any fail.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"status": "ok",
|
||||||
|
"checks": {
|
||||||
|
"database": {"status": "ok"},
|
||||||
|
"storage": {"status": "ok"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Failing checks include an `"error"` field. Storage failures also include a `"step"` field identifying which probe step failed (`write`, `size`, `read`, `verify`, `delete`). When the database check fails, the storage entry reports `{"status": "skipped"}` so the response always carries the same key set.
|
||||||
|
|
||||||
|
Storage probe results are cached for `health.storage_probe_interval` (default 30s) to bound the cost of probing remote backends. A probe holds an internal mutex for up to 10 seconds (the hardcoded per-probe timeout), so `/health` is intended as a Kubernetes **readiness** probe rather than a liveness probe — a slow S3 round-trip should pull the pod from rotation, not restart it.
|
||||||
|
|
||||||
Scrape config for Prometheus:
|
Scrape config for Prometheus:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
|
|
@ -868,20 +935,45 @@ When running behind nginx, Apache, or another reverse proxy, set `base_url` to y
|
||||||
base_url: "https://proxy.example.com"
|
base_url: "https://proxy.example.com"
|
||||||
```
|
```
|
||||||
|
|
||||||
nginx example:
|
If the UI is reached on a different hostname than the package endpoints — for example, the UI exposed publicly on a domain while build machines hit a Docker network alias — set `ui_base_url` separately. `base_url` is the URL package managers and metadata rewriting use; `ui_base_url` is the URL advertised to humans visiting the web UI (canonical/`og:url` tags and the install guide banner):
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
base_url: "http://pkg-proxy:8080" # internal alias for build machines
|
||||||
|
ui_base_url: "https://proxy.example.com/ui" # public UI URL
|
||||||
|
```
|
||||||
|
|
||||||
|
When unset, `ui_base_url` defaults to `base_url`.
|
||||||
|
|
||||||
|
> **Warning:** the proxy serves the UI and package endpoints on the same listener. Setting `ui_base_url` only changes what URL the UI advertises to humans; it does not stop package endpoints from being reachable on the same hostname and port. When fronting the proxy with a public reverse proxy, restrict the public route to `PathPrefix(/ui)` (or your proxy's equivalent), otherwise `/npm`, `/pypi`, and the other package endpoints stay exposed alongside the UI.
|
||||||
|
|
||||||
|
nginx example, restricting the public host to the UI while leaving package endpoints reachable only on the internal listener:
|
||||||
|
|
||||||
```nginx
|
```nginx
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name proxy.example.com;
|
server_name proxy.example.com;
|
||||||
|
|
||||||
location / {
|
location /ui/ {
|
||||||
proxy_pass http://127.0.0.1:8080;
|
proxy_pass http://127.0.0.1:8080;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_buffering off;
|
proxy_buffering off;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
return 404;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Traefik example using `PathPrefix(/ui)` so the public router only matches UI traffic:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
labels:
|
||||||
|
traefik.enable: "true"
|
||||||
|
traefik.http.services.pkg-proxy.loadbalancer.server.port: "8080"
|
||||||
|
traefik.http.routers.pkg-proxy.rule: "Host(`proxy.example.com`) && PathPrefix(`/ui`)"
|
||||||
|
traefik.http.routers.pkg-proxy.entrypoints: "websecure"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Cache Management
|
## Cache Management
|
||||||
|
|
@ -924,6 +1016,7 @@ The proxy will recreate the database on next start.
|
||||||
## Building from Source
|
## Building from Source
|
||||||
|
|
||||||
Requirements:
|
Requirements:
|
||||||
|
|
||||||
- Go 1.25 or later
|
- Go 1.25 or later
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,14 @@
|
||||||
// PROXY_DATABASE_URL - PostgreSQL connection URL
|
// PROXY_DATABASE_URL - PostgreSQL connection URL
|
||||||
// PROXY_LOG_LEVEL - Log level
|
// PROXY_LOG_LEVEL - Log level
|
||||||
// PROXY_LOG_FORMAT - Log format
|
// PROXY_LOG_FORMAT - Log format
|
||||||
|
// PROXY_UPSTREAM_MAVEN - Maven repository upstream URL
|
||||||
|
// PROXY_UPSTREAM_GRADLE_PLUGIN_PORTAL - Gradle Plugin Portal upstream URL
|
||||||
|
// PROXY_GRADLE_BUILD_CACHE_READ_ONLY - Disable Gradle PUT uploads
|
||||||
|
// PROXY_GRADLE_BUILD_CACHE_MAX_UPLOAD_SIZE - Max Gradle PUT request body size
|
||||||
|
// PROXY_GRADLE_BUILD_CACHE_MAX_AGE - Gradle cache max age eviction
|
||||||
|
// PROXY_GRADLE_BUILD_CACHE_MAX_SIZE - Gradle cache max total size
|
||||||
|
// PROXY_GRADLE_BUILD_CACHE_SWEEP_INTERVAL - Gradle cache eviction sweep interval
|
||||||
|
// PROXY_HEALTH_STORAGE_PROBE_INTERVAL - Storage health probe cache interval (default "30s")
|
||||||
//
|
//
|
||||||
// Example:
|
// Example:
|
||||||
//
|
//
|
||||||
|
|
@ -193,6 +201,14 @@ func runServe() {
|
||||||
fmt.Fprintf(os.Stderr, " PROXY_DATABASE_URL PostgreSQL connection URL\n")
|
fmt.Fprintf(os.Stderr, " PROXY_DATABASE_URL PostgreSQL connection URL\n")
|
||||||
fmt.Fprintf(os.Stderr, " PROXY_LOG_LEVEL Log level\n")
|
fmt.Fprintf(os.Stderr, " PROXY_LOG_LEVEL Log level\n")
|
||||||
fmt.Fprintf(os.Stderr, " PROXY_LOG_FORMAT Log format\n")
|
fmt.Fprintf(os.Stderr, " PROXY_LOG_FORMAT Log format\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_UPSTREAM_MAVEN Maven repository upstream URL\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_UPSTREAM_GRADLE_PLUGIN_PORTAL Gradle Plugin Portal upstream URL\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_GRADLE_BUILD_CACHE_READ_ONLY Disable Gradle PUT uploads\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_GRADLE_BUILD_CACHE_MAX_UPLOAD_SIZE Max Gradle PUT request body size\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_GRADLE_BUILD_CACHE_MAX_AGE Gradle cache max age eviction\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_GRADLE_BUILD_CACHE_MAX_SIZE Gradle cache max total size\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_GRADLE_BUILD_CACHE_SWEEP_INTERVAL Gradle cache eviction sweep interval\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " PROXY_HEALTH_STORAGE_PROBE_INTERVAL Storage health probe cache interval\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = fs.Parse(os.Args[1:])
|
_ = fs.Parse(os.Args[1:])
|
||||||
|
|
@ -454,6 +470,7 @@ func runMirror() {
|
||||||
proxy := handler.NewProxy(db, store, fetcher, resolver, logger)
|
proxy := handler.NewProxy(db, store, fetcher, resolver, logger)
|
||||||
proxy.CacheMetadata = true // mirror always caches metadata
|
proxy.CacheMetadata = true // mirror always caches metadata
|
||||||
proxy.MetadataTTL = cfg.ParseMetadataTTL()
|
proxy.MetadataTTL = cfg.ParseMetadataTTL()
|
||||||
|
proxy.MetadataMaxSize = cfg.ParseMetadataMaxSize()
|
||||||
|
|
||||||
m := mirror.New(proxy, db, store, logger, *concurrency)
|
m := mirror.New(proxy, db, store, logger, *concurrency)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,17 @@
|
||||||
# Server listen address
|
# Server listen address
|
||||||
listen: ":8080"
|
listen: ":8080"
|
||||||
|
|
||||||
# Public URL where this proxy is accessible
|
# Public URL where package endpoints are reachable.
|
||||||
# Used for rewriting package metadata URLs
|
# Used for rewriting package metadata URLs and shown in install guide snippets
|
||||||
|
# so users know what to point their package manager at.
|
||||||
base_url: "http://localhost:8080"
|
base_url: "http://localhost:8080"
|
||||||
|
|
||||||
|
# Public URL where the web UI is reached. Defaults to base_url when unset.
|
||||||
|
# Set this separately when the UI is served on a different hostname than the
|
||||||
|
# package endpoints — for example, the UI on a public domain behind auth while
|
||||||
|
# build machines hit a Docker network alias for the package endpoints.
|
||||||
|
# ui_base_url: "https://proxy.example.com/ui"
|
||||||
|
|
||||||
# Artifact storage configuration
|
# Artifact storage configuration
|
||||||
storage:
|
storage:
|
||||||
# Storage backend URL
|
# Storage backend URL
|
||||||
|
|
@ -29,6 +36,23 @@ storage:
|
||||||
# Empty or "0" means unlimited
|
# Empty or "0" means unlimited
|
||||||
max_size: ""
|
max_size: ""
|
||||||
|
|
||||||
|
# Redirect cached artifact downloads to presigned storage URLs (HTTP 302)
|
||||||
|
# instead of streaming through the proxy. Only effective for S3 and Azure.
|
||||||
|
# Leave disabled if clients reach the proxy through an authenticating gateway,
|
||||||
|
# since presigned URLs bypass it.
|
||||||
|
direct_serve: false
|
||||||
|
|
||||||
|
# How long presigned URLs remain valid (e.g. "5m", "1h"). Default: "15m".
|
||||||
|
direct_serve_ttl: "15m"
|
||||||
|
|
||||||
|
# Public base URL to substitute into presigned URLs. Set this when the
|
||||||
|
# proxy reaches storage at an internal address (127.0.0.1, a Docker
|
||||||
|
# service name) but clients must use a public hostname. Only scheme and
|
||||||
|
# host are used; the signed path and query are preserved. For S3/MinIO
|
||||||
|
# the reverse proxy at this address must forward requests with the
|
||||||
|
# internal Host header or the SigV4 signature will not validate.
|
||||||
|
# direct_serve_base_url: "https://minio.example.com"
|
||||||
|
|
||||||
# Database configuration
|
# Database configuration
|
||||||
database:
|
database:
|
||||||
# Database driver: "sqlite" (default) or "postgres"
|
# Database driver: "sqlite" (default) or "postgres"
|
||||||
|
|
@ -54,6 +78,12 @@ upstream:
|
||||||
# npm registry URL
|
# npm registry URL
|
||||||
npm: "https://registry.npmjs.org"
|
npm: "https://registry.npmjs.org"
|
||||||
|
|
||||||
|
# Maven repository URL (used by /maven endpoint)
|
||||||
|
maven: "https://repo1.maven.org/maven2"
|
||||||
|
|
||||||
|
# Gradle Plugin Portal Maven URL (fallback for plugin marker artifacts)
|
||||||
|
gradle_plugin_portal: "https://plugins.gradle.org/m2"
|
||||||
|
|
||||||
# Cargo sparse index URL
|
# Cargo sparse index URL
|
||||||
cargo: "https://index.crates.io"
|
cargo: "https://index.crates.io"
|
||||||
|
|
||||||
|
|
@ -91,6 +121,35 @@ upstream:
|
||||||
# header_name: "X-Auth-Token"
|
# header_name: "X-Auth-Token"
|
||||||
# header_value: "${MAVEN_TOKEN}"
|
# header_value: "${MAVEN_TOKEN}"
|
||||||
|
|
||||||
|
# Gradle HttpBuildCache configuration
|
||||||
|
gradle:
|
||||||
|
build_cache:
|
||||||
|
# Set to true to disable PUT uploads (read-only cache mode)
|
||||||
|
read_only: false
|
||||||
|
|
||||||
|
# Maximum accepted Gradle cache upload body size
|
||||||
|
# Required and must be > 0
|
||||||
|
max_upload_size: "100MB"
|
||||||
|
|
||||||
|
# Evict entries older than this age (set to "0" to disable age-based eviction)
|
||||||
|
max_age: "168h"
|
||||||
|
|
||||||
|
# Cap total Gradle cache size; oldest entries are deleted first
|
||||||
|
# ("0" disables size-based eviction)
|
||||||
|
# max_size: "20GB"
|
||||||
|
|
||||||
|
# How often eviction runs when max_age or max_size is set
|
||||||
|
sweep_interval: "10m"
|
||||||
|
|
||||||
|
# Health endpoint configuration.
|
||||||
|
health:
|
||||||
|
# Minimum time between storage backend probes.
|
||||||
|
# The /health endpoint runs a write/read/verify/delete round-trip
|
||||||
|
# against the configured storage backend and caches the result for
|
||||||
|
# this interval. Set to "0" to probe on every request.
|
||||||
|
# Default: "30s".
|
||||||
|
storage_probe_interval: "30s"
|
||||||
|
|
||||||
# Version cooldown configuration
|
# Version cooldown configuration
|
||||||
# Hides package versions published too recently, giving the community time
|
# Hides package versions published too recently, giving the community time
|
||||||
# to spot malicious releases before they're pulled into projects.
|
# to spot malicious releases before they're pulled into projects.
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ The proxy is a caching HTTP server that sits between package manager clients and
|
||||||
│ │ /npm/* -> NPMHandler /health -> healthHandler │ │
|
│ │ /npm/* -> NPMHandler /health -> healthHandler │ │
|
||||||
│ │ /cargo/* -> CargoHandler /stats -> statsHandler │ │
|
│ │ /cargo/* -> CargoHandler /stats -> statsHandler │ │
|
||||||
│ │ /gem/* -> GemHandler /metrics -> prometheus │ │
|
│ │ /gem/* -> GemHandler /metrics -> prometheus │ │
|
||||||
│ │ ...16 ecosystems /api/* -> APIHandler │ │
|
│ │ ...17 ecosystems /api/* -> APIHandler │ │
|
||||||
│ │ / -> Web UI │ │
|
│ │ /ui/* -> Web UI │ │
|
||||||
│ └──────────────────────────────────────────────────────────┘ │
|
│ └──────────────────────────────────────────────────────────┘ │
|
||||||
│ │ │ │ │
|
│ │ │ │ │
|
||||||
│ ▼ ▼ ▼ │
|
│ ▼ ▼ ▼ │
|
||||||
|
|
@ -274,18 +274,18 @@ HTTP server setup, web UI, and API handlers.
|
||||||
- Creates and wires together all components
|
- Creates and wires together all components
|
||||||
- Mounts protocol handlers at ecosystem-specific paths
|
- Mounts protocol handlers at ecosystem-specific paths
|
||||||
- Middleware: request ID, real IP, logging, panic recovery, active request tracking
|
- Middleware: request ID, real IP, logging, panic recovery, active request tracking
|
||||||
- Web UI: dashboard, package browser, source browser, version comparison
|
- Web UI under `/ui`: dashboard, package browser, source browser, version comparison
|
||||||
- Templates are embedded in the binary via `//go:embed`
|
- Templates are embedded in the binary via `//go:embed`
|
||||||
- Enrichment API for package metadata, vulnerability scanning, and outdated detection
|
- Enrichment API for package metadata, vulnerability scanning, and outdated detection
|
||||||
- Health, stats, and Prometheus metrics endpoints
|
- Health, stats, and Prometheus metrics endpoints. `/health` runs an active write → size-check → read → verify → delete probe against the storage backend and returns a structured JSON response (`HealthResponse`) with `"ok"` / `"error"` status per subsystem. Probe results are cached (default 30 s, configurable via `health.storage_probe_interval`) to avoid overwhelming remote backends.
|
||||||
|
|
||||||
### `internal/metrics`
|
### `internal/metrics`
|
||||||
|
|
||||||
Prometheus metrics for cache performance, upstream latency, storage operations, and active requests. See the Monitoring section of the README for the full metric list.
|
Prometheus metrics for cache performance, upstream latency, storage operations, and active requests. See the Monitoring section of the README for the full metric list.
|
||||||
|
|
||||||
### `internal/cooldown`
|
### Cooldown
|
||||||
|
|
||||||
Version age filtering for supply chain attack mitigation. Configurable at global, ecosystem, and per-package levels. Supported by npm, PyPI, pub.dev, and Composer handlers.
|
Version age filtering for supply chain attack mitigation, provided by [github.com/git-pkgs/cooldown](https://github.com/git-pkgs/cooldown). Configurable at global, ecosystem, and per-package levels. Supported by npm, PyPI, pub.dev, and Composer handlers.
|
||||||
|
|
||||||
### `internal/enrichment`
|
### `internal/enrichment`
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,8 @@ See `config.example.yaml` in the repository root for a complete example.
|
||||||
| Config | Environment | Flag | Default | Description |
|
| Config | Environment | Flag | Default | Description |
|
||||||
|--------|-------------|------|---------|-------------|
|
|--------|-------------|------|---------|-------------|
|
||||||
| `listen` | `PROXY_LISTEN` | `-listen` | `:8080` | Address to listen on |
|
| `listen` | `PROXY_LISTEN` | `-listen` | `:8080` | Address to listen on |
|
||||||
| `base_url` | `PROXY_BASE_URL` | `-base-url` | `http://localhost:8080` | Public URL for the proxy |
|
| `base_url` | `PROXY_BASE_URL` | `-base-url` | `http://localhost:8080` | Public URL package managers use to reach this proxy |
|
||||||
|
| `ui_base_url` | `PROXY_UI_URL` | - | (defaults to `base_url`) | Public URL where the web UI is reached. Set separately when the UI lives behind a different hostname than package endpoints (e.g. public domain vs Docker network alias). Used for canonical/og:url tags and the install guide banner. The proxy still serves package endpoints on the same listener, so any reverse proxy fronting the UI publicly should restrict the public route to `PathPrefix(/ui)` to avoid exposing package endpoints. |
|
||||||
|
|
||||||
## Storage
|
## Storage
|
||||||
|
|
||||||
|
|
@ -114,6 +115,8 @@ Override default upstream registry URLs:
|
||||||
```yaml
|
```yaml
|
||||||
upstream:
|
upstream:
|
||||||
npm: "https://registry.npmjs.org"
|
npm: "https://registry.npmjs.org"
|
||||||
|
maven: "https://repo1.maven.org/maven2"
|
||||||
|
gradle_plugin_portal: "https://plugins.gradle.org/m2"
|
||||||
cargo: "https://index.crates.io"
|
cargo: "https://index.crates.io"
|
||||||
cargo_download: "https://static.crates.io/crates"
|
cargo_download: "https://static.crates.io/crates"
|
||||||
```
|
```
|
||||||
|
|
@ -184,6 +187,30 @@ upstream:
|
||||||
token: "${PRIVATE_TOKEN}"
|
token: "${PRIVATE_TOKEN}"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Gradle Build Cache
|
||||||
|
|
||||||
|
The `/gradle` endpoint supports optional safeguards for upload control and cache retention.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
gradle:
|
||||||
|
build_cache:
|
||||||
|
read_only: false
|
||||||
|
max_upload_size: "100MB"
|
||||||
|
max_age: "168h"
|
||||||
|
max_size: "20GB"
|
||||||
|
sweep_interval: "10m"
|
||||||
|
```
|
||||||
|
|
||||||
|
| Config | Environment | Description |
|
||||||
|
|--------|-------------|-------------|
|
||||||
|
| `gradle.build_cache.read_only` | `PROXY_GRADLE_BUILD_CACHE_READ_ONLY` | Disable PUT uploads and keep GET/HEAD read-only |
|
||||||
|
| `gradle.build_cache.max_upload_size` | `PROXY_GRADLE_BUILD_CACHE_MAX_UPLOAD_SIZE` | Maximum accepted PUT body size (must be > 0) |
|
||||||
|
| `gradle.build_cache.max_age` | `PROXY_GRADLE_BUILD_CACHE_MAX_AGE` | Delete entries older than this duration (default `168h`, set `0` to disable) |
|
||||||
|
| `gradle.build_cache.max_size` | `PROXY_GRADLE_BUILD_CACHE_MAX_SIZE` | Total size cap for `_gradle/http-build-cache`, deleting oldest first (`0` disables) |
|
||||||
|
| `gradle.build_cache.sweep_interval` | `PROXY_GRADLE_BUILD_CACHE_SWEEP_INTERVAL` | Frequency for background eviction sweeps |
|
||||||
|
|
||||||
|
`max_age` and `max_size` are independent and can be combined. When both are set, age-based eviction runs first, then size-based eviction trims remaining entries oldest-first.
|
||||||
|
|
||||||
## Cooldown
|
## Cooldown
|
||||||
|
|
||||||
The cooldown feature hides package versions published too recently, giving the community time to spot malicious releases before they reach your projects. When a version is within its cooldown period, it's stripped from metadata responses so package managers won't install it.
|
The cooldown feature hides package versions published too recently, giving the community time to spot malicious releases before they reach your projects. When a version is within its cooldown period, it's stripped from metadata responses so package managers won't install it.
|
||||||
|
|
@ -239,6 +266,16 @@ Set to `"0"` to always revalidate with upstream (ETag-based conditional requests
|
||||||
|
|
||||||
When upstream is unreachable and the cached entry is past its TTL, the proxy serves the stale cached copy with a `Warning: 110 - "Response is Stale"` header so clients can tell the data may be outdated.
|
When upstream is unreachable and the cached entry is past its TTL, the proxy serves the stale cached copy with a `Warning: 110 - "Response is Stale"` header so clients can tell the data may be outdated.
|
||||||
|
|
||||||
|
### Metadata size limit
|
||||||
|
|
||||||
|
Upstream metadata responses are buffered in memory before being rewritten and served. `metadata_max_size` caps that buffer to protect against OOM from a misbehaving upstream. Some npm packages with thousands of versions (for example `renovate`) exceed the 100 MB default, so raise this if you see `metadata response exceeds size limit` in the logs.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
metadata_max_size: "100MB" # default
|
||||||
|
```
|
||||||
|
|
||||||
|
Or via environment variable: `PROXY_METADATA_MAX_SIZE=250MB`.
|
||||||
|
|
||||||
## Mirror API
|
## Mirror API
|
||||||
|
|
||||||
The `/api/mirror` endpoints are disabled by default. Enable them to allow starting mirror jobs via HTTP:
|
The `/api/mirror` endpoints are disabled by default. Enable them to allow starting mirror jobs via HTTP:
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,246 @@ const docTemplate = `{
|
||||||
"host": "{{.Host}}",
|
"host": "{{.Host}}",
|
||||||
"basePath": "{{.BasePath}}",
|
"basePath": "{{.BasePath}}",
|
||||||
"paths": {
|
"paths": {
|
||||||
"/api/browse/{ecosystem}/{name}/{version}": {
|
"/api/bulk": {
|
||||||
|
"post": {
|
||||||
|
"consumes": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Bulk package lookup by PURL",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"description": "PURLs",
|
||||||
|
"name": "request",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.BulkRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.BulkResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/outdated": {
|
||||||
|
"post": {
|
||||||
|
"consumes": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Check outdated packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"description": "Packages to check",
|
||||||
|
"name": "request",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.OutdatedRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.OutdatedResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/packages": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "List cached packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Ecosystem",
|
||||||
|
"name": "ecosystem",
|
||||||
|
"in": "query"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enum": [
|
||||||
|
"hits",
|
||||||
|
"name",
|
||||||
|
"size",
|
||||||
|
"cached_at",
|
||||||
|
"ecosystem",
|
||||||
|
"vulns"
|
||||||
|
],
|
||||||
|
"type": "string",
|
||||||
|
"description": "Sort",
|
||||||
|
"name": "sort",
|
||||||
|
"in": "query"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.PackagesListResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/search": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Search cached packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Query",
|
||||||
|
"name": "q",
|
||||||
|
"in": "query",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Ecosystem",
|
||||||
|
"name": "ecosystem",
|
||||||
|
"in": "query"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.SearchResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/health": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"meta"
|
||||||
|
],
|
||||||
|
"summary": "Health check",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.HealthResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"503": {
|
||||||
|
"description": "Service Unavailable",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.HealthResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/stats": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"meta"
|
||||||
|
],
|
||||||
|
"summary": "Cache statistics",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.StatsResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/ui/api/browse/{ecosystem}/{name}/{version}": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Lists files from the first cached artifact for a package version.",
|
"description": "Lists files from the first cached artifact for a package version.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -64,19 +303,19 @@ const docTemplate = `{
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/api/browse/{ecosystem}/{name}/{version}/file/{filepath}": {
|
"/ui/api/browse/{ecosystem}/{name}/{version}/file/{filepath}": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Streams a single file from the cached artifact. The file path may contain slashes.",
|
"description": "Streams a single file from the cached artifact. The file path may contain slashes.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -126,70 +365,25 @@ const docTemplate = `{
|
||||||
"400": {
|
"400": {
|
||||||
"description": "Bad Request",
|
"description": "Bad Request",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/api/bulk": {
|
"/ui/api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion}": {
|
||||||
"post": {
|
|
||||||
"consumes": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Bulk package lookup by PURL",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"description": "PURLs",
|
|
||||||
"name": "request",
|
|
||||||
"in": "body",
|
|
||||||
"required": true,
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.BulkRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.BulkResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion}": {
|
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Returns a structured diff for two cached versions.",
|
"description": "Returns a structured diff for two cached versions.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -240,207 +434,13 @@ const docTemplate = `{
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/outdated": {
|
|
||||||
"post": {
|
|
||||||
"consumes": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Check outdated packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"description": "Packages to check",
|
|
||||||
"name": "request",
|
|
||||||
"in": "body",
|
|
||||||
"required": true,
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.OutdatedRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.OutdatedResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/packages": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "List cached packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Ecosystem",
|
|
||||||
"name": "ecosystem",
|
|
||||||
"in": "query"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"enum": [
|
|
||||||
"hits",
|
|
||||||
"name",
|
|
||||||
"size",
|
|
||||||
"cached_at",
|
|
||||||
"ecosystem",
|
|
||||||
"vulns"
|
|
||||||
],
|
|
||||||
"type": "string",
|
|
||||||
"description": "Sort",
|
|
||||||
"name": "sort",
|
|
||||||
"in": "query"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.PackagesListResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/search": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Search cached packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Query",
|
|
||||||
"name": "q",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Ecosystem",
|
|
||||||
"name": "ecosystem",
|
|
||||||
"in": "query"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.SearchResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/health": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"text/plain"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"meta"
|
|
||||||
],
|
|
||||||
"summary": "Health check",
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"503": {
|
|
||||||
"description": "Service Unavailable",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/stats": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"meta"
|
|
||||||
],
|
|
||||||
"summary": "Cache statistics",
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.StatsResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -504,6 +504,45 @@ const docTemplate = `{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"server.ErrorResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"code": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"message": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"server.HealthCheck": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"error": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"step": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"server.HealthResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"checks": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": {
|
||||||
|
"$ref": "#/definitions/server.HealthCheck"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"server.OutdatedPackage": {
|
"server.OutdatedPackage": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,246 @@
|
||||||
},
|
},
|
||||||
"basePath": "/",
|
"basePath": "/",
|
||||||
"paths": {
|
"paths": {
|
||||||
"/api/browse/{ecosystem}/{name}/{version}": {
|
"/api/bulk": {
|
||||||
|
"post": {
|
||||||
|
"consumes": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Bulk package lookup by PURL",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"description": "PURLs",
|
||||||
|
"name": "request",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.BulkRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.BulkResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/outdated": {
|
||||||
|
"post": {
|
||||||
|
"consumes": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Check outdated packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"description": "Packages to check",
|
||||||
|
"name": "request",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.OutdatedRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.OutdatedResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/packages": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "List cached packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Ecosystem",
|
||||||
|
"name": "ecosystem",
|
||||||
|
"in": "query"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enum": [
|
||||||
|
"hits",
|
||||||
|
"name",
|
||||||
|
"size",
|
||||||
|
"cached_at",
|
||||||
|
"ecosystem",
|
||||||
|
"vulns"
|
||||||
|
],
|
||||||
|
"type": "string",
|
||||||
|
"description": "Sort",
|
||||||
|
"name": "sort",
|
||||||
|
"in": "query"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.PackagesListResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/search": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"api"
|
||||||
|
],
|
||||||
|
"summary": "Search cached packages",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Query",
|
||||||
|
"name": "q",
|
||||||
|
"in": "query",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"description": "Ecosystem",
|
||||||
|
"name": "ecosystem",
|
||||||
|
"in": "query"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.SearchResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/health": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"meta"
|
||||||
|
],
|
||||||
|
"summary": "Health check",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.HealthResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"503": {
|
||||||
|
"description": "Service Unavailable",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.HealthResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/stats": {
|
||||||
|
"get": {
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"meta"
|
||||||
|
],
|
||||||
|
"summary": "Cache statistics",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.StatsResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/ui/api/browse/{ecosystem}/{name}/{version}": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Lists files from the first cached artifact for a package version.",
|
"description": "Lists files from the first cached artifact for a package version.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -57,19 +296,19 @@
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/api/browse/{ecosystem}/{name}/{version}/file/{filepath}": {
|
"/ui/api/browse/{ecosystem}/{name}/{version}/file/{filepath}": {
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Streams a single file from the cached artifact. The file path may contain slashes.",
|
"description": "Streams a single file from the cached artifact. The file path may contain slashes.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -119,70 +358,25 @@
|
||||||
"400": {
|
"400": {
|
||||||
"description": "Bad Request",
|
"description": "Bad Request",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/api/bulk": {
|
"/ui/api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion}": {
|
||||||
"post": {
|
|
||||||
"consumes": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Bulk package lookup by PURL",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"description": "PURLs",
|
|
||||||
"name": "request",
|
|
||||||
"in": "body",
|
|
||||||
"required": true,
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.BulkRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.BulkResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion}": {
|
|
||||||
"get": {
|
"get": {
|
||||||
"description": "Returns a structured diff for two cached versions.",
|
"description": "Returns a structured diff for two cached versions.",
|
||||||
"produces": [
|
"produces": [
|
||||||
|
|
@ -233,207 +427,13 @@
|
||||||
"404": {
|
"404": {
|
||||||
"description": "Not Found",
|
"description": "Not Found",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
"description": "Internal Server Error",
|
"description": "Internal Server Error",
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "string"
|
"$ref": "#/definitions/server.ErrorResponse"
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/outdated": {
|
|
||||||
"post": {
|
|
||||||
"consumes": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Check outdated packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"description": "Packages to check",
|
|
||||||
"name": "request",
|
|
||||||
"in": "body",
|
|
||||||
"required": true,
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.OutdatedRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.OutdatedResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/packages": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "List cached packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Ecosystem",
|
|
||||||
"name": "ecosystem",
|
|
||||||
"in": "query"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"enum": [
|
|
||||||
"hits",
|
|
||||||
"name",
|
|
||||||
"size",
|
|
||||||
"cached_at",
|
|
||||||
"ecosystem",
|
|
||||||
"vulns"
|
|
||||||
],
|
|
||||||
"type": "string",
|
|
||||||
"description": "Sort",
|
|
||||||
"name": "sort",
|
|
||||||
"in": "query"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.PackagesListResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/search": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"api"
|
|
||||||
],
|
|
||||||
"summary": "Search cached packages",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Query",
|
|
||||||
"name": "q",
|
|
||||||
"in": "query",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "string",
|
|
||||||
"description": "Ecosystem",
|
|
||||||
"name": "ecosystem",
|
|
||||||
"in": "query"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.SearchResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Bad Request",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/health": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"text/plain"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"meta"
|
|
||||||
],
|
|
||||||
"summary": "Health check",
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"503": {
|
|
||||||
"description": "Service Unavailable",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/stats": {
|
|
||||||
"get": {
|
|
||||||
"produces": [
|
|
||||||
"application/json"
|
|
||||||
],
|
|
||||||
"tags": [
|
|
||||||
"meta"
|
|
||||||
],
|
|
||||||
"summary": "Cache statistics",
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "OK",
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/definitions/server.StatsResponse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Internal Server Error",
|
|
||||||
"schema": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -497,6 +497,45 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"server.ErrorResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"code": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"message": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"server.HealthCheck": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"error": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"step": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"server.HealthResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"checks": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": {
|
||||||
|
"$ref": "#/definitions/server.HealthCheck"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"server.OutdatedPackage": {
|
"server.OutdatedPackage": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
|
||||||
118
go.mod
118
go.mod
|
|
@ -3,31 +3,35 @@ module github.com/git-pkgs/proxy
|
||||||
go 1.25.6
|
go 1.25.6
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/CycloneDX/cyclonedx-go v0.10.0
|
github.com/BurntSushi/toml v1.6.0
|
||||||
github.com/git-pkgs/archives v0.2.2
|
github.com/CycloneDX/cyclonedx-go v0.11.0
|
||||||
github.com/git-pkgs/enrichment v0.2.2
|
github.com/git-pkgs/archives v0.3.0
|
||||||
github.com/git-pkgs/purl v0.1.10
|
github.com/git-pkgs/cooldown v0.1.1
|
||||||
github.com/git-pkgs/registries v0.4.1
|
github.com/git-pkgs/enrichment v0.4.1
|
||||||
github.com/git-pkgs/spdx v0.1.2
|
github.com/git-pkgs/purl v0.1.13
|
||||||
github.com/git-pkgs/vers v0.2.4
|
github.com/git-pkgs/registries v0.6.2
|
||||||
github.com/git-pkgs/vulns v0.1.4
|
github.com/git-pkgs/spdx v0.1.4
|
||||||
github.com/go-chi/chi/v5 v5.2.5
|
github.com/git-pkgs/vers v0.2.6
|
||||||
|
github.com/git-pkgs/vulns v0.1.6
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0
|
||||||
github.com/jmoiron/sqlx v1.4.0
|
github.com/jmoiron/sqlx v1.4.0
|
||||||
github.com/lib/pq v1.12.3
|
github.com/lib/pq v1.12.3
|
||||||
github.com/prometheus/client_golang v1.23.2
|
github.com/prometheus/client_golang v1.23.2
|
||||||
github.com/prometheus/client_model v0.6.2
|
github.com/prometheus/client_model v0.6.2
|
||||||
github.com/spdx/tools-golang v0.5.7
|
github.com/spdx/tools-golang v0.5.7
|
||||||
github.com/swaggo/swag v1.16.6
|
github.com/swaggo/swag v1.16.6
|
||||||
gocloud.dev v0.45.0
|
gocloud.dev v0.46.0
|
||||||
golang.org/x/sync v0.20.0
|
golang.org/x/sync v0.21.0
|
||||||
google.golang.org/protobuf v1.36.11
|
google.golang.org/protobuf v1.36.11
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
modernc.org/sqlite v1.48.2
|
modernc.org/sqlite v1.53.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
|
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
|
||||||
4d63.com/gochecknoglobals v0.2.2 // indirect
|
4d63.com/gochecknoglobals v0.2.2 // indirect
|
||||||
|
cloud.google.com/go/auth v0.18.2 // indirect
|
||||||
|
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
|
||||||
cloud.google.com/go/compute/metadata v0.9.0 // indirect
|
cloud.google.com/go/compute/metadata v0.9.0 // indirect
|
||||||
codeberg.org/chavacava/garif v0.2.0 // indirect
|
codeberg.org/chavacava/garif v0.2.0 // indirect
|
||||||
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
|
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
|
||||||
|
|
@ -40,7 +44,11 @@ require (
|
||||||
github.com/Antonboom/errname v1.1.1 // indirect
|
github.com/Antonboom/errname v1.1.1 // indirect
|
||||||
github.com/Antonboom/nilnil v1.1.1 // indirect
|
github.com/Antonboom/nilnil v1.1.1 // indirect
|
||||||
github.com/Antonboom/testifylint v1.6.4 // indirect
|
github.com/Antonboom/testifylint v1.6.4 // indirect
|
||||||
github.com/BurntSushi/toml v1.6.0 // indirect
|
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 // indirect
|
||||||
|
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 // indirect
|
||||||
github.com/Djarvur/go-err113 v0.1.1 // indirect
|
github.com/Djarvur/go-err113 v0.1.1 // indirect
|
||||||
github.com/KyleBanks/depth v1.2.1 // indirect
|
github.com/KyleBanks/depth v1.2.1 // indirect
|
||||||
github.com/Masterminds/semver/v3 v3.4.0 // indirect
|
github.com/Masterminds/semver/v3 v3.4.0 // indirect
|
||||||
|
|
@ -59,26 +67,25 @@ require (
|
||||||
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
|
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
|
||||||
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
|
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
|
||||||
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
|
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2 v1.41.3 // indirect
|
github.com/aws/aws-sdk-go-v2 v1.41.9 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 // indirect
|
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/config v1.32.11 // indirect
|
github.com/aws/aws-sdk-go-v2/config v1.32.20 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/credentials v1.19.11 // indirect
|
github.com/aws/aws-sdk-go-v2/credentials v1.19.19 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 // indirect
|
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.5 // indirect
|
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.3 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 // indirect
|
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 // indirect
|
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 // indirect
|
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.19 // indirect
|
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 // indirect
|
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11 // indirect
|
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 // indirect
|
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19 // indirect
|
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.3 // indirect
|
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect
|
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 // indirect
|
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 // indirect
|
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 // indirect
|
github.com/aws/smithy-go v1.26.0 // indirect
|
||||||
github.com/aws/smithy-go v1.24.2 // indirect
|
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
github.com/beorn7/perks v1.0.1 // indirect
|
||||||
github.com/bkielbasa/cyclop v1.2.3 // indirect
|
github.com/bkielbasa/cyclop v1.2.3 // indirect
|
||||||
|
|
@ -108,7 +115,7 @@ require (
|
||||||
github.com/denis-tingaikin/go-header v0.5.0 // indirect
|
github.com/denis-tingaikin/go-header v0.5.0 // indirect
|
||||||
github.com/dlclark/regexp2 v1.11.5 // indirect
|
github.com/dlclark/regexp2 v1.11.5 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/ecosyste-ms/ecosystems-go v0.1.1 // indirect
|
github.com/ecosyste-ms/ecosystems-go v0.2.0 // indirect
|
||||||
github.com/ettle/strcase v0.2.0 // indirect
|
github.com/ettle/strcase v0.2.0 // indirect
|
||||||
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
|
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
|
||||||
github.com/fatih/color v1.18.0 // indirect
|
github.com/fatih/color v1.18.0 // indirect
|
||||||
|
|
@ -118,7 +125,8 @@ require (
|
||||||
github.com/fzipp/gocyclo v0.6.0 // indirect
|
github.com/fzipp/gocyclo v0.6.0 // indirect
|
||||||
github.com/ghostiam/protogetter v0.3.20 // indirect
|
github.com/ghostiam/protogetter v0.3.20 // indirect
|
||||||
github.com/git-pkgs/packageurl-go v0.3.1 // indirect
|
github.com/git-pkgs/packageurl-go v0.3.1 // indirect
|
||||||
github.com/github/go-spdx/v2 v2.4.0 // indirect
|
github.com/git-pkgs/pom v0.1.5 // indirect
|
||||||
|
github.com/github/go-spdx/v2 v2.7.0 // indirect
|
||||||
github.com/go-critic/go-critic v0.14.3 // indirect
|
github.com/go-critic/go-critic v0.14.3 // indirect
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
github.com/go-logr/logr v1.4.3 // indirect
|
||||||
github.com/go-logr/stdr v1.2.2 // indirect
|
github.com/go-logr/stdr v1.2.2 // indirect
|
||||||
|
|
@ -138,6 +146,7 @@ require (
|
||||||
github.com/gobwas/glob v0.2.3 // indirect
|
github.com/gobwas/glob v0.2.3 // indirect
|
||||||
github.com/godoc-lint/godoc-lint v0.11.2 // indirect
|
github.com/godoc-lint/godoc-lint v0.11.2 // indirect
|
||||||
github.com/gofrs/flock v0.13.0 // indirect
|
github.com/gofrs/flock v0.13.0 // indirect
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
|
||||||
github.com/golangci/asciicheck v0.5.0 // indirect
|
github.com/golangci/asciicheck v0.5.0 // indirect
|
||||||
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
|
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
|
||||||
github.com/golangci/go-printf-func-name v0.1.1 // indirect
|
github.com/golangci/go-printf-func-name v0.1.1 // indirect
|
||||||
|
|
@ -150,9 +159,11 @@ require (
|
||||||
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
|
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
|
||||||
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
|
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
|
||||||
github.com/google/go-cmp v0.7.0 // indirect
|
github.com/google/go-cmp v0.7.0 // indirect
|
||||||
|
github.com/google/s2a-go v0.1.9 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/google/wire v0.7.0 // indirect
|
github.com/google/wire v0.7.0 // indirect
|
||||||
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
|
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
|
||||||
|
github.com/googleapis/gax-go/v2 v2.19.0 // indirect
|
||||||
github.com/gordonklaus/ineffassign v0.2.0 // indirect
|
github.com/gordonklaus/ineffassign v0.2.0 // indirect
|
||||||
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
|
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
|
||||||
github.com/gostaticanalysis/comment v1.5.0 // indirect
|
github.com/gostaticanalysis/comment v1.5.0 // indirect
|
||||||
|
|
@ -174,6 +185,7 @@ require (
|
||||||
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
|
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
|
||||||
github.com/kulti/thelper v0.7.1 // indirect
|
github.com/kulti/thelper v0.7.1 // indirect
|
||||||
github.com/kunwardeep/paralleltest v1.0.15 // indirect
|
github.com/kunwardeep/paralleltest v1.0.15 // indirect
|
||||||
|
github.com/kylelemons/godebug v1.1.0 // indirect
|
||||||
github.com/lasiar/canonicalheader v1.1.2 // indirect
|
github.com/lasiar/canonicalheader v1.1.2 // indirect
|
||||||
github.com/ldez/exptostd v0.4.5 // indirect
|
github.com/ldez/exptostd v0.4.5 // indirect
|
||||||
github.com/ldez/gomoddirectives v0.8.0 // indirect
|
github.com/ldez/gomoddirectives v0.8.0 // indirect
|
||||||
|
|
@ -205,10 +217,12 @@ require (
|
||||||
github.com/nishanths/exhaustive v0.12.0 // indirect
|
github.com/nishanths/exhaustive v0.12.0 // indirect
|
||||||
github.com/nishanths/predeclared v0.2.2 // indirect
|
github.com/nishanths/predeclared v0.2.2 // indirect
|
||||||
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
|
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
|
||||||
github.com/oapi-codegen/runtime v1.2.0 // indirect
|
github.com/oapi-codegen/runtime v1.4.1 // indirect
|
||||||
|
github.com/package-url/packageurl-go v0.1.6 // indirect
|
||||||
github.com/pandatix/go-cvss v0.6.2 // indirect
|
github.com/pandatix/go-cvss v0.6.2 // indirect
|
||||||
github.com/pelletier/go-toml v1.9.5 // indirect
|
github.com/pelletier/go-toml v1.9.5 // indirect
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
||||||
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/prometheus/common v0.67.5 // indirect
|
github.com/prometheus/common v0.67.5 // indirect
|
||||||
github.com/prometheus/procfs v0.20.1 // indirect
|
github.com/prometheus/procfs v0.20.1 // indirect
|
||||||
|
|
@ -268,30 +282,32 @@ require (
|
||||||
go.augendre.info/arangolint v0.4.0 // indirect
|
go.augendre.info/arangolint v0.4.0 // indirect
|
||||||
go.augendre.info/fatcontext v0.9.0 // indirect
|
go.augendre.info/fatcontext v0.9.0 // indirect
|
||||||
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
|
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
|
||||||
go.opentelemetry.io/otel v1.41.0 // indirect
|
go.opentelemetry.io/otel v1.44.0 // indirect
|
||||||
go.opentelemetry.io/otel/metric v1.41.0 // indirect
|
go.opentelemetry.io/otel/metric v1.44.0 // indirect
|
||||||
go.opentelemetry.io/otel/sdk v1.41.0 // indirect
|
go.opentelemetry.io/otel/sdk v1.44.0 // indirect
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect
|
go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect
|
||||||
go.opentelemetry.io/otel/trace v1.41.0 // indirect
|
go.opentelemetry.io/otel/trace v1.44.0 // indirect
|
||||||
go.uber.org/multierr v1.11.0 // indirect
|
go.uber.org/multierr v1.11.0 // indirect
|
||||||
go.uber.org/zap v1.27.1 // indirect
|
go.uber.org/zap v1.27.1 // indirect
|
||||||
go.yaml.in/yaml/v2 v2.4.3 // indirect
|
go.yaml.in/yaml/v2 v2.4.3 // indirect
|
||||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
||||||
|
golang.org/x/crypto v0.51.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
|
||||||
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
|
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
|
||||||
golang.org/x/mod v0.33.0 // indirect
|
golang.org/x/mod v0.36.0 // indirect
|
||||||
golang.org/x/net v0.51.0 // indirect
|
golang.org/x/net v0.54.0 // indirect
|
||||||
golang.org/x/sys v0.42.0 // indirect
|
golang.org/x/oauth2 v0.36.0 // indirect
|
||||||
golang.org/x/text v0.34.0 // indirect
|
golang.org/x/sys v0.45.0 // indirect
|
||||||
golang.org/x/tools v0.42.0 // indirect
|
golang.org/x/text v0.37.0 // indirect
|
||||||
|
golang.org/x/tools v0.45.0 // indirect
|
||||||
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
|
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
|
||||||
google.golang.org/api v0.269.0 // indirect
|
google.golang.org/api v0.272.0 // indirect
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 // indirect
|
||||||
google.golang.org/grpc v1.79.1 // indirect
|
google.golang.org/grpc v1.81.1 // indirect
|
||||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
honnef.co/go/tools v0.7.0 // indirect
|
honnef.co/go/tools v0.7.0 // indirect
|
||||||
modernc.org/libc v1.70.0 // indirect
|
modernc.org/libc v1.73.4 // indirect
|
||||||
modernc.org/mathutil v1.7.1 // indirect
|
modernc.org/mathutil v1.7.1 // indirect
|
||||||
modernc.org/memory v1.11.0 // indirect
|
modernc.org/memory v1.11.0 // indirect
|
||||||
mvdan.cc/gofumpt v0.9.2 // indirect
|
mvdan.cc/gofumpt v0.9.2 // indirect
|
||||||
|
|
|
||||||
323
go.sum
323
go.sum
|
|
@ -16,8 +16,8 @@ cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
|
||||||
cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
|
cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
|
||||||
cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
|
cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
|
||||||
cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
|
cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
|
||||||
cloud.google.com/go/storage v1.57.2 h1:sVlym3cHGYhrp6XZKkKb+92I1V42ks2qKKpB0CF5Mb4=
|
cloud.google.com/go/storage v1.61.3 h1:VS//ZfBuPGDvakfD9xyPW1RGF1Vy3BWUoVZXgW1KMOg=
|
||||||
cloud.google.com/go/storage v1.57.2/go.mod h1:n5ijg4yiRXXpCu0sJTD6k+eMf7GRrJmPyr9YxLXGHOk=
|
cloud.google.com/go/storage v1.61.3/go.mod h1:JtqK8BBB7TWv0HVGHubtUdzYYrakOQIsMLffZ2Z/HWk=
|
||||||
codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY=
|
codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY=
|
||||||
codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ=
|
codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ=
|
||||||
codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI=
|
codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI=
|
||||||
|
|
@ -27,8 +27,8 @@ dev.gaijin.team/go/exhaustruct/v4 v4.0.0/go.mod h1:aZ/k2o4Y05aMJtiux15x8iXaumE88
|
||||||
dev.gaijin.team/go/golib v0.6.0 h1:v6nnznFTs4bppib/NyU1PQxobwDHwCXXl15P7DV5Zgo=
|
dev.gaijin.team/go/golib v0.6.0 h1:v6nnznFTs4bppib/NyU1PQxobwDHwCXXl15P7DV5Zgo=
|
||||||
dev.gaijin.team/go/golib v0.6.0/go.mod h1:uY1mShx8Z/aNHWDyAkZTkX+uCi5PdX7KsG1eDQa2AVE=
|
dev.gaijin.team/go/golib v0.6.0/go.mod h1:uY1mShx8Z/aNHWDyAkZTkX+uCi5PdX7KsG1eDQa2AVE=
|
||||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||||
filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
|
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
|
||||||
filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
|
||||||
github.com/4meepo/tagalign v1.4.3 h1:Bnu7jGWwbfpAie2vyl63Zup5KuRv21olsPIha53BJr8=
|
github.com/4meepo/tagalign v1.4.3 h1:Bnu7jGWwbfpAie2vyl63Zup5KuRv21olsPIha53BJr8=
|
||||||
github.com/4meepo/tagalign v1.4.3/go.mod h1:00WwRjiuSbrRJnSVeGWPLp2epS5Q/l4UEy0apLLS37c=
|
github.com/4meepo/tagalign v1.4.3/go.mod h1:00WwRjiuSbrRJnSVeGWPLp2epS5Q/l4UEy0apLLS37c=
|
||||||
github.com/Abirdcfly/dupword v0.1.7 h1:2j8sInznrje4I0CMisSL6ipEBkeJUJAmK1/lfoNGWrQ=
|
github.com/Abirdcfly/dupword v0.1.7 h1:2j8sInznrje4I0CMisSL6ipEBkeJUJAmK1/lfoNGWrQ=
|
||||||
|
|
@ -43,19 +43,35 @@ github.com/Antonboom/nilnil v1.1.1 h1:9Mdr6BYd8WHCDngQnNVV0b554xyisFioEKi30sksuf
|
||||||
github.com/Antonboom/nilnil v1.1.1/go.mod h1:yCyAmSw3doopbOWhJlVci+HuyNRuHJKIv6V2oYQa8II=
|
github.com/Antonboom/nilnil v1.1.1/go.mod h1:yCyAmSw3doopbOWhJlVci+HuyNRuHJKIv6V2oYQa8II=
|
||||||
github.com/Antonboom/testifylint v1.6.4 h1:gs9fUEy+egzxkEbq9P4cpcMB6/G0DYdMeiFS87UiqmQ=
|
github.com/Antonboom/testifylint v1.6.4 h1:gs9fUEy+egzxkEbq9P4cpcMB6/G0DYdMeiFS87UiqmQ=
|
||||||
github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9qpVy7nXGbxDD4=
|
github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9qpVy7nXGbxDD4=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
|
||||||
|
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
|
||||||
|
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
|
||||||
|
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 h1:4iB+IesclUXdP0ICgAabvq2FYLXrJWKx1fJQ+GxSo3Y=
|
||||||
|
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
|
||||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||||
github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
|
github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
|
||||||
github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||||
github.com/CycloneDX/cyclonedx-go v0.10.0 h1:7xyklU7YD+CUyGzSFIARG18NYLsKVn4QFg04qSsu+7Y=
|
github.com/CycloneDX/cyclonedx-go v0.11.0 h1:GokP8FiRC+foiuwWhSSLpSD5H4hSWtGnR3wo7apkBFI=
|
||||||
github.com/CycloneDX/cyclonedx-go v0.10.0/go.mod h1:vUvbCXQsEm48OI6oOlanxstwNByXjCZ2wuleUlwGEO8=
|
github.com/CycloneDX/cyclonedx-go v0.11.0/go.mod h1:vUvbCXQsEm48OI6oOlanxstwNByXjCZ2wuleUlwGEO8=
|
||||||
github.com/Djarvur/go-err113 v0.1.1 h1:eHfopDqXRwAi+YmCUas75ZE0+hoBHJ2GQNLYRSxao4g=
|
github.com/Djarvur/go-err113 v0.1.1 h1:eHfopDqXRwAi+YmCUas75ZE0+hoBHJ2GQNLYRSxao4g=
|
||||||
github.com/Djarvur/go-err113 v0.1.1/go.mod h1:IaWJdYFLg76t2ihfflPZnM1LIQszWOsFDh2hhhAVF6k=
|
github.com/Djarvur/go-err113 v0.1.1/go.mod h1:IaWJdYFLg76t2ihfflPZnM1LIQszWOsFDh2hhhAVF6k=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 h1:DHa2U07rk8syqvCge0QIGMCE1WxGj9njT44GH7zNJLQ=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 h1:lhhYARPUu3LmHysQ/igznQphfzynnqI3D75oUyw1HXk=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 h1:UnDZ/zFfG1JhH/DqxIZYU/1CUAlTUScoXD/LcM2Ykk8=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0/go.mod h1:l9rva3ApbBpEJxSNYnwT9N4CDLrWgtq3u8736C5hyJw=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0/go.mod h1:IA1C1U7jO/ENqm/vhi7V9YYpBsp+IMyqNrEN94N7tVc=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 h1:s0WlVbf9qpvkh1c/uDAPElam0WrL7fHRIidgZJ7UqZI=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 h1:0s6TxfCu2KHkkZPnBfsQ2y5qia0jl3MMrmBhu3nCOYk=
|
||||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc=
|
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc=
|
||||||
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
|
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
|
||||||
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
|
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
|
||||||
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
|
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
|
||||||
|
|
@ -95,46 +111,44 @@ github.com/ashanbrown/forbidigo/v2 v2.3.0 h1:OZZDOchCgsX5gvToVtEBoV2UWbFfI6RKQTi
|
||||||
github.com/ashanbrown/forbidigo/v2 v2.3.0/go.mod h1:5p6VmsG5/1xx3E785W9fouMxIOkvY2rRV9nMdWadd6c=
|
github.com/ashanbrown/forbidigo/v2 v2.3.0/go.mod h1:5p6VmsG5/1xx3E785W9fouMxIOkvY2rRV9nMdWadd6c=
|
||||||
github.com/ashanbrown/makezero/v2 v2.1.0 h1:snuKYMbqosNokUKm+R6/+vOPs8yVAi46La7Ck6QYSaE=
|
github.com/ashanbrown/makezero/v2 v2.1.0 h1:snuKYMbqosNokUKm+R6/+vOPs8yVAi46La7Ck6QYSaE=
|
||||||
github.com/ashanbrown/makezero/v2 v2.1.0/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY=
|
github.com/ashanbrown/makezero/v2 v2.1.0/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY=
|
||||||
github.com/aws/aws-sdk-go-v2 v1.41.3 h1:4kQ/fa22KjDt13QCy1+bYADvdgcxpfH18f0zP542kZA=
|
github.com/aws/aws-sdk-go-v2 v1.41.9 h1:/rYeyO2+HrMztAmxAq9++XJtFMqSIpSsNA0yDGALYq4=
|
||||||
github.com/aws/aws-sdk-go-v2 v1.41.3/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
|
github.com/aws/aws-sdk-go-v2 v1.41.9/go.mod h1:+HsoOEX80qAVUitj1A2DhCNTjmb3edVyuDypb6LNEeo=
|
||||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 h1:N4lRUXZpZ1KVEUn6hxtco/1d2lgYhNn1fHkkl8WhlyQ=
|
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 h1:h5+3VT69KUBK24grGuuA5saDJTj2IIjLb9au668Fo5I=
|
||||||
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=
|
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11/go.mod h1:dnakxebH6UwFvcvujL0LVggYQ8nEvBGjU4G/V79Nv94=
|
||||||
github.com/aws/aws-sdk-go-v2/config v1.32.11 h1:ftxI5sgz8jZkckuUHXfC/wMUc8u3fG1vQS0plr2F2Zs=
|
github.com/aws/aws-sdk-go-v2/config v1.32.20 h1:8VMDnWc/kEzxsI/1ngGM9mG81a8IGmIHD8KLcYGwagc=
|
||||||
github.com/aws/aws-sdk-go-v2/config v1.32.11/go.mod h1:twF11+6ps9aNRKEDimksp923o44w/Thk9+8YIlzWMmo=
|
github.com/aws/aws-sdk-go-v2/config v1.32.20/go.mod h1:PuwEpciweIXGULWeOeSTXtSbH4CW9mWdWrhdCKQI1sM=
|
||||||
github.com/aws/aws-sdk-go-v2/credentials v1.19.11 h1:NdV8cwCcAXrCWyxArt58BrvZJ9pZ9Fhf9w6Uh5W3Uyc=
|
github.com/aws/aws-sdk-go-v2/credentials v1.19.19 h1:yuFzSV1U0aRNYCQGVaTY2zW2M/L93pYHnXnrJUphYhU=
|
||||||
github.com/aws/aws-sdk-go-v2/credentials v1.19.11/go.mod h1:30yY2zqkMPdrvxBqzI9xQCM+WrlrZKSOpSJEsylVU+8=
|
github.com/aws/aws-sdk-go-v2/credentials v1.19.19/go.mod h1:7y63L1kGzeoDlJaQ3Z578KrnmfBut96JjvJUzGwR+YE=
|
||||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 h1:INUvJxmhdEbVulJYHI061k4TVuS3jzzthNvjqvVvTKM=
|
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25 h1:0w6dCiO8iez+YKwRhRBlL1CH/E3GTfdkuzrwj1by8vo=
|
||||||
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19/go.mod h1:FpZN2QISLdEBWkayloda+sZjVJL+e9Gl0k1SyTgcswU=
|
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25/go.mod h1:9FDWUothyr5RCRAHc45XOiVCzUR8n/IhCYX+uVqw6vk=
|
||||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.5 h1:4nC6vsVBU6vClZxxF6XLEozLUY/PgUCXYlGGB/VaC8M=
|
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.3 h1:w5OoDiMN6x53ROmiIImGzmVcxXv2q1GXY+aKV4WAJYM=
|
||||||
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.5/go.mod h1:N5c+La/yy7H4YnF9rFgUqwgbfw+MloWoCHQ0RJH2EBE=
|
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.3/go.mod h1:dAhgYp776bX3LuWvnSCFwQEjNs6fuFg7YXIy5PXcP3Q=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 h1:/sECfyq2JTifMI2JPyZ4bdRN77zJmr6SrS1eL3augIA=
|
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25 h1:Uii3frf9ztec/ABM2/FSH9/z7PLzxfpG8h4RpkUFflQ=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19/go.mod h1:dMf8A5oAqr9/oxOfLkC/c2LU/uMcALP0Rgn2BD5LWn0=
|
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25/go.mod h1:G6kntsA2GorAxDPbap6xgB2F+amSLUF8GJTi7PUoX44=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 h1:AWeJMk33GTBf6J20XJe6qZoRSJo0WfUhsMdUKhoODXE=
|
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25 h1:r1+/l6m+WaUJF9HISEsNOLHSNj5EXYQxK8VX6Cz9NlA=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19/go.mod h1:+GWrYoaAsV7/4pNHpwh1kiNLXkKaSoppxQq9lbH8Ejw=
|
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25/go.mod h1:cKf+D+NMDK1LndD7BowHbBZPgR9V0/5HubH0PFWvA+c=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 h1:clHU5fm//kWS1C2HgtgWxfQbFbx4b6rx+5jzhgX9HrI=
|
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 h1:A1PmWU2zfkIm9EyFlJncFXL4W4phML+h8KjltUsCvNQ=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
|
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26/go.mod h1:dY4MRzXEizrD4hqtpKvWVGPX7QleSGGVY+EBolo1RmM=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.19 h1:3Y4oma5TiV7tT9wa8zRcdoXwZkGz9Q/wxbEUK7cMuAM=
|
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg=
|
||||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.19/go.mod h1:V1K+TeJVD5JOk3D9e5tsX2KUdL7BlB+FV6cBhdobN8c=
|
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 h1:XAq62tBTJP/85lFD5oqOOe7YYgWxY9LvWq8plyDvDVg=
|
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 h1:W/EyPFl9A5rXrtoilfwHYEvzHER+K4SpBPtMXi24Mos=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=
|
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18/go.mod h1:UG50K+pvd/uy6xExbobg0rjqFBFZe6I3l75EPDZw4tg=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11 h1:BYf7XNsJMzl4mObARUBUib+j2tf0U//JAAtTnYqvqCw=
|
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25 h1:dD3dhHNglpd98gs72my22Ndqi1hqQGllFFg1F+twfxg=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11/go.mod h1:aEUS4WrNk/+FxkBZZa7tVgp4pGH+kFGW40Y8rCPqt5g=
|
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25/go.mod h1:0yAbjPfd64gG7mj85RW+fMEYdfBgCRZw8g/oWcL1pjc=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 h1:X1Tow7suZk9UCJHE1Iw9GMZJJl0dAnKXXP1NaSDHwmw=
|
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 h1:2pQEbwf+/6EDbiit/GcBE2K4IUpMZymaA0kOz3xK978=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19/go.mod h1:/rARO8psX+4sfjUQXp5LLifjUt8DuATZ31WptNJTyQA=
|
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25/go.mod h1:KvT6NCcQ0EZ+ZkVRrlBMt04Po3ok23YELEp7WimhLhM=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19 h1:JnQeStZvPHFHeyky/7LbMlyQjUa+jIBj36OlWm0pzIk=
|
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2 h1:ie4ElCmUKS26pzrZcIk/lmt4yWjAqLLcawstyQCh298=
|
||||||
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19/go.mod h1:HGyasyHvYdFQeJhvDHfH7HXkHh57htcJGKDZ+7z+I24=
|
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2/go.mod h1:zjsomFeX5duj+4PlMB+o4JoWTIx+G0XMyzjYrUbQkN0=
|
||||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.3 h1:+d0SsTvxtIJt4tSJ6wr+jrxEMDa6XeupjRv8H7Qitkk=
|
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1 h1:1VwbP3qMNfxUDEXWki4rCE5iA+44VA1lokTz9HasGzw=
|
||||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.3/go.mod h1:ROUNFvFWPwBlOu687WJNQ9cPvd2ccpFrnCiA1YGz50o=
|
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1/go.mod h1:vUtyoSj0OPji3kjIVSc/GlKuWEiL33f/WFxl6dmpy/A=
|
||||||
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 h1:Y2cAXlClHsXkkOvWZFXATr34b0hxxloeQu/pAZz2row=
|
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19 h1:N6pIsdFOW1Kd9S4KyFKXdGRBojPPxkP32+uHFWLv4Hc=
|
||||||
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7/go.mod h1:idzZ7gmDeqeNrSPkdbtMp9qWMgcBwykA7P7Rzh5DXVU=
|
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19/go.mod h1:3gt5WJArFooNmyLONS+h/R4J+o86II8du38IgCwj9dE=
|
||||||
github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 h1:iSsvB9EtQ09YrsmIc44Heqlx5ByGErqhPK1ZQLppias=
|
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2 h1:hc+lBYiiTr8Zk4MTzIsQ92MeDWCIDvWGmzKUWOaBcOg=
|
||||||
github.com/aws/aws-sdk-go-v2/service/sso v1.30.12/go.mod h1:fEWYKTRGoZNl8tZ77i61/ccwOMJdGxwOhWCkp6TXAr0=
|
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2/go.mod h1:hU6fqB3OJA6/ePheD47LQnxvjYk6br6PtQxs+Q9ojvk=
|
||||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 h1:EnUdUqRP1CNzt2DkV67tJx6XDN4xlfBFm+bzeNOQVb0=
|
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3 h1:ErklX/7uhSbkAAeyQD/Y1OoQ9hO3SJXQNEgksORW3Js=
|
||||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16/go.mod h1:Jic/xv0Rq/pFNCh3WwpH4BEqdbSAl+IyHro8LbibHD8=
|
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3/go.mod h1:ULe4HCzfKPiR6R3HEurE3b1upEkuk8AkMrOKtaOxKO8=
|
||||||
github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 h1:XQTQTF75vnug2TXS8m7CVJfC2nniYPZnO1D4Np761Oo=
|
github.com/aws/smithy-go v1.26.0 h1:9ouqbi+NyKP7fV3Te7UElCwdAb6Y8uk7LGwPE5tVe/s=
|
||||||
github.com/aws/aws-sdk-go-v2/service/sts v1.41.8/go.mod h1:Xgx+PR1NUOjNmQY+tRMnouRp83JRM8pRMw/vCaVhPkI=
|
github.com/aws/smithy-go v1.26.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
|
||||||
github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
|
|
||||||
github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
|
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
||||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||||
|
|
@ -180,8 +194,8 @@ github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQ
|
||||||
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
|
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
|
||||||
github.com/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs=
|
github.com/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs=
|
||||||
github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk=
|
github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk=
|
||||||
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=
|
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik=
|
||||||
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5/go.mod h1:KdCmV+x/BuvyMxRnYBlmVaq4OLiKW6iRQfvC62cvdkI=
|
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
|
github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||||
|
|
@ -203,13 +217,13 @@ github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZ
|
||||||
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
github.com/ecosyste-ms/ecosystems-go v0.1.1 h1:YYiBK9TCCTeE+BtmpN2FssaRFcmF+T0v4LrupIOjehQ=
|
github.com/ecosyste-ms/ecosystems-go v0.2.0 h1:Nhpg54C+St8Sd/mf8bNJmQqx35ZgHw33TfFoxaXMQI8=
|
||||||
github.com/ecosyste-ms/ecosystems-go v0.1.1/go.mod h1:VczXs1CO9nL8XbL1NwvgmwIaqzMsAxcsXnTpRtwi9gU=
|
github.com/ecosyste-ms/ecosystems-go v0.2.0/go.mod h1:CCdzT1iAZirbEZAbFSnWpK88eKKaIWex7gjtZ0UudXA=
|
||||||
github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
|
github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
|
||||||
github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3reDNEnfOboJ0QySbH736g=
|
github.com/envoyproxy/go-control-plane/envoy v1.37.0 h1:u3riX6BoYRfF4Dr7dwSOroNfdSbEPe9Yyl09/B6wBrQ=
|
||||||
github.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
|
github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQOAOHNYMALuowAnbjjEMkkWOi6A=
|
||||||
github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
|
github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=
|
||||||
github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
|
github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
|
||||||
github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
|
github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
|
||||||
github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
|
github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
|
||||||
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
|
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
|
||||||
|
|
@ -230,30 +244,34 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
|
||||||
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
|
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
|
||||||
github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0=
|
github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0=
|
||||||
github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI=
|
github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI=
|
||||||
github.com/git-pkgs/archives v0.2.2 h1:RxOjrV8RzKicbMVdf2GDKOqIOHZNVjrLY/Pc7KSE/WQ=
|
github.com/git-pkgs/archives v0.3.0 h1:iXKyO83jEFub1PGEDlHmk2tQ7XeV5LySTc0sEkH3x78=
|
||||||
github.com/git-pkgs/archives v0.2.2/go.mod h1:LTJ1iQVFA7otizWMOyiI82NYVmyBWAPRzwu/e30rcXU=
|
github.com/git-pkgs/archives v0.3.0/go.mod h1:LTJ1iQVFA7otizWMOyiI82NYVmyBWAPRzwu/e30rcXU=
|
||||||
github.com/git-pkgs/enrichment v0.2.2 h1:vaQu5vs3tjQB5JI0gzBrUCynUc9z3l5byPhgKFaNZrc=
|
github.com/git-pkgs/cooldown v0.1.1 h1:9OqqzCB8gANz/y44SmqGD0Jp8Qtu81D1sCbKl6Ehg7w=
|
||||||
github.com/git-pkgs/enrichment v0.2.2/go.mod h1:5JWGmlHWcv5HQHUrctcpnRUNpEF5VAixD2z4zvqKejs=
|
github.com/git-pkgs/cooldown v0.1.1/go.mod h1:v7APuK/UouTiu8mWQZbdDmj7DfxxkGUeuhjaRB5gv9E=
|
||||||
|
github.com/git-pkgs/enrichment v0.4.1 h1:A8BKs0XwvpF1sF5qviZy4fkJAe18qB9OgpbRnmwnT34=
|
||||||
|
github.com/git-pkgs/enrichment v0.4.1/go.mod h1:stHqZUitV9ZkwACqHzBysLMSe6T4QZn81hxTdSroNhM=
|
||||||
github.com/git-pkgs/packageurl-go v0.3.1 h1:WM3RBABQZLaRBxgKyYughc3cVBE8KyQxbSC6Jt5ak7M=
|
github.com/git-pkgs/packageurl-go v0.3.1 h1:WM3RBABQZLaRBxgKyYughc3cVBE8KyQxbSC6Jt5ak7M=
|
||||||
github.com/git-pkgs/packageurl-go v0.3.1/go.mod h1:rcIxiG37BlQLB6FZfgdj9Fm7yjhRQd3l+5o7J0QPAk4=
|
github.com/git-pkgs/packageurl-go v0.3.1/go.mod h1:rcIxiG37BlQLB6FZfgdj9Fm7yjhRQd3l+5o7J0QPAk4=
|
||||||
github.com/git-pkgs/purl v0.1.10 h1:NMjeF10nzFn3tdQlz6rbmHB+i+YkyrFQxho3e33ePTQ=
|
github.com/git-pkgs/pom v0.1.5 h1:TGT8Az2OMxGWsXnSagtUMGzZm7Oax8HrSCteA+mi0qY=
|
||||||
github.com/git-pkgs/purl v0.1.10/go.mod h1:C5Vp/kyZ/wGckCLexx4wPVfUxEiToRkdsOPh5Z7ig/I=
|
github.com/git-pkgs/pom v0.1.5/go.mod h1:ufdMBe1lKzqOeP9IUb9NPZ458xKV8E8NvuyBMxOfwIk=
|
||||||
github.com/git-pkgs/registries v0.4.1 h1:4qlKVNhC/6x6Bt87t3wrGJtF3EFrUpHQt9/zKsa5IvU=
|
github.com/git-pkgs/purl v0.1.13 h1:at8BU6vnP5oonHFHAPA064BzgRqij+SZcOUDgNT2DC8=
|
||||||
github.com/git-pkgs/registries v0.4.1/go.mod h1:49UCPFWQmwNV7rBEr9TrTDWKR7vYxFcxp3VfdkeFbdE=
|
github.com/git-pkgs/purl v0.1.13/go.mod h1:8oCcdcYZA/e1B33e7Ylju6azboTKjdqf3ybcbQj6I/o=
|
||||||
github.com/git-pkgs/spdx v0.1.2 h1:wHSK+CqFsO5N7yDTPvxDmer5LgNEa7vAsiZhi5Aci0A=
|
github.com/git-pkgs/registries v0.6.2 h1:26G5zW6Q7x1CSfNkaEqEjRMJiA4JwfdKOCJ7Qm+u0a8=
|
||||||
github.com/git-pkgs/spdx v0.1.2/go.mod h1:V98MgZapNgYw54/pdGR82d7RU93qzJoybahbpZqTfw8=
|
github.com/git-pkgs/registries v0.6.2/go.mod h1:GR0Bu6nC3NQe6f7lfDoEVqAnoQkMocf4M98B12a7B3E=
|
||||||
github.com/git-pkgs/vers v0.2.4 h1:Zr3jR/Xf1i/6cvBaJKPxhCwjzqz7uvYHE0Fhid/GPBk=
|
github.com/git-pkgs/spdx v0.1.4 h1:eQ0waEV3uUeItpWAOvdN1K1rL9hTgsU7fF74r1mDXMs=
|
||||||
github.com/git-pkgs/vers v0.2.4/go.mod h1:biTbSQK1qdbrsxDEKnqe3Jzclxz8vW6uDcwKjfUGcOo=
|
github.com/git-pkgs/spdx v0.1.4/go.mod h1:cqRoZcvl530s/W+oGNvwjt4ODN8T1W6D/20MUZEFdto=
|
||||||
github.com/git-pkgs/vulns v0.1.4 h1:SlnGWHNmtdQgABjfrX/I/pVe+DWLbZ5Yi9xg+/De5r8=
|
github.com/git-pkgs/vers v0.2.6 h1:IelZd7BP/JhzTloUTDY67nehUgoYva3g9viqAMCHJg8=
|
||||||
github.com/git-pkgs/vulns v0.1.4/go.mod h1:34xkR7QncIVfxoi78k3YT6Y9DfTEaL7j6PzCqjsRP9U=
|
github.com/git-pkgs/vers v0.2.6/go.mod h1:biTbSQK1qdbrsxDEKnqe3Jzclxz8vW6uDcwKjfUGcOo=
|
||||||
github.com/github/go-spdx/v2 v2.4.0 h1:+4IwVwJJbm3rzvrQ6P1nI9BDMcy3la4RchRy5uehV/M=
|
github.com/git-pkgs/vulns v0.1.6 h1:8RRSgdlxp4JMU0Zykr63XTOMo5CyZKwt/PwaQxrx9Yg=
|
||||||
github.com/github/go-spdx/v2 v2.4.0/go.mod h1:/5rwgS0txhGtRdUZwc02bTglzg6HK3FfuEbECKlK2Sg=
|
github.com/git-pkgs/vulns v0.1.6/go.mod h1:TsZC4MjoCkKJslgmbcmRCnytwnFcjESC2N8b0a2xDWc=
|
||||||
github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
|
github.com/github/go-spdx/v2 v2.7.0 h1:GzfXx4wFdlilARxmFRXW/mgUy3A4vSqZocCMFV6XFdQ=
|
||||||
github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
|
github.com/github/go-spdx/v2 v2.7.0/go.mod h1:Ftc45YYG1WzpzwEPKRVm9Jv8vDqOrN4gWoCkK+bHer0=
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM=
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=
|
||||||
github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog=
|
github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog=
|
||||||
github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
|
github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
|
||||||
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
|
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
|
||||||
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
||||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||||
|
|
@ -305,6 +323,8 @@ github.com/godoc-lint/godoc-lint v0.11.2 h1:Bp0FkJWoSdNsBikdNgIcgtaoo+xz6I/Y9s5W
|
||||||
github.com/godoc-lint/godoc-lint v0.11.2/go.mod h1:iVpGdL1JCikNH2gGeAn3Hh+AgN5Gx/I/cxV+91L41jo=
|
github.com/godoc-lint/godoc-lint v0.11.2/go.mod h1:iVpGdL1JCikNH2gGeAn3Hh+AgN5Gx/I/cxV+91L41jo=
|
||||||
github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
|
github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
|
||||||
github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
|
github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||||
github.com/golangci/asciicheck v0.5.0 h1:jczN/BorERZwK8oiFBOGvlGPknhvq0bjnysTj4nUfo0=
|
github.com/golangci/asciicheck v0.5.0 h1:jczN/BorERZwK8oiFBOGvlGPknhvq0bjnysTj4nUfo0=
|
||||||
|
|
@ -348,10 +368,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
|
github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
|
||||||
github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
|
github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.3.12 h1:Fg+zsqzYEs1ZnvmcztTYxhgCBsx3eEhEwQ1W/lHq/sQ=
|
github.com/googleapis/enterprise-certificate-proxy v0.3.14 h1:yh8ncqsbUY4shRD5dA6RlzjJaT4hi3kII+zYw8wmLb8=
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.3.12/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
|
github.com/googleapis/enterprise-certificate-proxy v0.3.14/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
|
||||||
github.com/googleapis/gax-go/v2 v2.17.0 h1:RksgfBpxqff0EZkDWYuz9q/uWsTVz+kf43LsZ1J6SMc=
|
github.com/googleapis/gax-go/v2 v2.19.0 h1:fYQaUOiGwll0cGj7jmHT/0nPlcrZDFPrZRhTsoCr8hE=
|
||||||
github.com/googleapis/gax-go/v2 v2.17.0/go.mod h1:mzaqghpQp4JDh3HvADwrat+6M3MOIDp5YKHhb9PAgDY=
|
github.com/googleapis/gax-go/v2 v2.19.0/go.mod h1:w2ROXVdfGEVFXzmlciUU4EdjHgWvB5h2n6x/8XSTTJA=
|
||||||
github.com/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs=
|
github.com/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs=
|
||||||
github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw=
|
github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw=
|
||||||
github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
|
github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
|
||||||
|
|
@ -396,6 +416,8 @@ github.com/julz/importas v0.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ=
|
||||||
github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY=
|
github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY=
|
||||||
github.com/karamaru-alpha/copyloopvar v1.2.2 h1:yfNQvP9YaGQR7VaWLYcfZUlRP2eo2vhExWKxD/fP6q0=
|
github.com/karamaru-alpha/copyloopvar v1.2.2 h1:yfNQvP9YaGQR7VaWLYcfZUlRP2eo2vhExWKxD/fP6q0=
|
||||||
github.com/karamaru-alpha/copyloopvar v1.2.2/go.mod h1:oY4rGZqZ879JkJMtX3RRkcXRkmUvH0x35ykgaKgsgJY=
|
github.com/karamaru-alpha/copyloopvar v1.2.2/go.mod h1:oY4rGZqZ879JkJMtX3RRkcXRkmUvH0x35ykgaKgsgJY=
|
||||||
|
github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=
|
||||||
|
github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
|
||||||
github.com/kisielk/errcheck v1.9.0 h1:9xt1zI9EBfcYBvdU1nVrzMzzUPUtPKs9bVSIM3TAb3M=
|
github.com/kisielk/errcheck v1.9.0 h1:9xt1zI9EBfcYBvdU1nVrzMzzUPUtPKs9bVSIM3TAb3M=
|
||||||
github.com/kisielk/errcheck v1.9.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8=
|
github.com/kisielk/errcheck v1.9.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8=
|
||||||
github.com/kkHAIKE/contextcheck v1.1.6 h1:7HIyRcnyzxL9Lz06NGhiKvenXq7Zw6Q0UQu/ttjfJCE=
|
github.com/kkHAIKE/contextcheck v1.1.6 h1:7HIyRcnyzxL9Lz06NGhiKvenXq7Zw6Q0UQu/ttjfJCE=
|
||||||
|
|
@ -488,8 +510,10 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm
|
||||||
github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
|
github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
|
||||||
github.com/nunnatsa/ginkgolinter v0.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8=
|
github.com/nunnatsa/ginkgolinter v0.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8=
|
||||||
github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4=
|
github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4=
|
||||||
github.com/oapi-codegen/runtime v1.2.0 h1:RvKc1CVS1QeKSNzO97FBQbSMZyQ8s6rZd+LpmzwHMP4=
|
github.com/oapi-codegen/nullable v1.1.0 h1:eAh8JVc5430VtYVnq00Hrbpag9PFRGWLjxR1/3KntMs=
|
||||||
github.com/oapi-codegen/runtime v1.2.0/go.mod h1:Y7ZhmmlE8ikZOmuHRRndiIm7nf3xcVv+YMweKgG1DT0=
|
github.com/oapi-codegen/nullable v1.1.0/go.mod h1:KUZ3vUzkmEKY90ksAmit2+5juDIhIZhfDl+0PwOQlFY=
|
||||||
|
github.com/oapi-codegen/runtime v1.4.1 h1:9nwLoI+KrWxzbBcp0jO/R8uXqbik/HUyCvPeU68Y/qo=
|
||||||
|
github.com/oapi-codegen/runtime v1.4.1/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU=
|
||||||
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
|
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
|
||||||
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
|
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
|
||||||
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
|
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
|
||||||
|
|
@ -501,6 +525,8 @@ github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJ
|
||||||
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
|
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
|
||||||
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
|
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
|
||||||
github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
|
github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
|
||||||
|
github.com/package-url/packageurl-go v0.1.6 h1:YO3p6u1XmCUliivUg/qWphaY8vI6hxSnnPv7Bfg3m5M=
|
||||||
|
github.com/package-url/packageurl-go v0.1.6/go.mod h1:nKAWB8E6uk1MHqiS/lQb9pYBGH2+mdJ2PJc2s50dQY0=
|
||||||
github.com/pandatix/go-cvss v0.6.2 h1:TFiHlzUkT67s6UkelHmK6s1INKVUG7nlKYiWWDTITGI=
|
github.com/pandatix/go-cvss v0.6.2 h1:TFiHlzUkT67s6UkelHmK6s1INKVUG7nlKYiWWDTITGI=
|
||||||
github.com/pandatix/go-cvss v0.6.2/go.mod h1:jDXYlQBZrc8nvrMUVVvTG8PhmuShOnKrxP53nOFkt8Q=
|
github.com/pandatix/go-cvss v0.6.2/go.mod h1:jDXYlQBZrc8nvrMUVVvTG8PhmuShOnKrxP53nOFkt8Q=
|
||||||
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
|
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
|
||||||
|
|
@ -509,6 +535,8 @@ github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||||
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea h1:sKwxy1H95npauwu8vtF95vG/syrL0p8fSZo/XlDg5gk=
|
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea h1:sKwxy1H95npauwu8vtF95vG/syrL0p8fSZo/XlDg5gk=
|
||||||
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea/go.mod h1:1VcHEd3ro4QMoHfiNl/j7Jkln9+KQuorp0PItHMJYNg=
|
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea/go.mod h1:1VcHEd3ro4QMoHfiNl/j7Jkln9+KQuorp0PItHMJYNg=
|
||||||
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
|
||||||
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
|
||||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
|
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
|
||||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
|
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
|
@ -674,22 +702,24 @@ go.augendre.info/fatcontext v0.9.0 h1:Gt5jGD4Zcj8CDMVzjOJITlSb9cEch54hjRRlN3qDoj
|
||||||
go.augendre.info/fatcontext v0.9.0/go.mod h1:L94brOAT1OOUNue6ph/2HnwxoNlds9aXDF2FcUntbNw=
|
go.augendre.info/fatcontext v0.9.0/go.mod h1:L94brOAT1OOUNue6ph/2HnwxoNlds9aXDF2FcUntbNw=
|
||||||
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
||||||
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
||||||
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE=
|
go.opentelemetry.io/contrib/detectors/gcp v1.42.0 h1:kpt2PEJuOuqYkPcktfJqWWDjTEd/FNgrxcniL7kQrXQ=
|
||||||
go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=
|
go.opentelemetry.io/contrib/detectors/gcp v1.42.0/go.mod h1:W9zQ439utxymRrXsUOzZbFX4JhLxXU4+ZnCt8GG7yA8=
|
||||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
|
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 h1:yI1/OhfEPy7J9eoa6Sj051C7n5dvpj0QX8g4sRchg04=
|
||||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
|
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
|
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
|
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
|
||||||
go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c=
|
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
|
||||||
go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE=
|
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
|
||||||
go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ=
|
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
|
||||||
go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps=
|
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
|
||||||
go.opentelemetry.io/otel/sdk v1.41.0 h1:YPIEXKmiAwkGl3Gu1huk1aYWwtpRLeskpV+wPisxBp8=
|
go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=
|
||||||
go.opentelemetry.io/otel/sdk v1.41.0/go.mod h1:ahFdU0G5y8IxglBf0QBJXgSe7agzjE4GiTJ6HT9ud90=
|
go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.41.0 h1:siZQIYBAUd1rlIWQT2uCxWJxcCO7q3TriaMlf08rXw8=
|
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.41.0/go.mod h1:HNBuSvT7ROaGtGI50ArdRLUnvRTRGniSUZbxiWxSO8Y=
|
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
|
||||||
go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0=
|
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
|
||||||
go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis=
|
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
|
||||||
|
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
|
||||||
|
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||||
|
|
@ -700,16 +730,16 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
|
||||||
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
|
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
|
||||||
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
gocloud.dev v0.45.0 h1:WknIK8IbRdmynDvara3Q7G6wQhmEiOGwpgJufbM39sY=
|
gocloud.dev v0.46.0 h1:niIuZwSjMtBx8K+ITB2s5kZullB13PGOS2ZoQPZxQ4Q=
|
||||||
gocloud.dev v0.45.0/go.mod h1:0kXKmkCLG6d31N7NyLZWzt7jDSQura9zD/mWgiB6THI=
|
gocloud.dev v0.46.0/go.mod h1:ACQe+2qO+hEO+pdcvvsM+RB63r8TyGD1W3ESCLFyzvM=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
||||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||||
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
|
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
|
||||||
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
|
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
|
||||||
golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
|
golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
|
||||||
|
|
@ -725,8 +755,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
|
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
|
||||||
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
|
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
|
@ -741,10 +771,10 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||||
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||||
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||||
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
|
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
|
||||||
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
|
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
|
||||||
golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
|
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
|
||||||
golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
|
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
|
@ -754,8 +784,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||||
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||||
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
|
||||||
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
|
@ -771,13 +801,14 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||||
golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
|
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
|
||||||
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
|
|
@ -792,10 +823,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
|
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
|
||||||
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
|
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
|
||||||
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
|
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
|
||||||
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
|
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
||||||
|
|
@ -808,8 +839,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
|
||||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||||
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
|
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
|
||||||
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
|
golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
|
||||||
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
|
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
|
||||||
golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
|
golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
|
||||||
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
|
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
|
||||||
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
|
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
|
||||||
|
|
@ -820,18 +851,18 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
|
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
|
||||||
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
|
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
|
||||||
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
|
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
|
||||||
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
|
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
|
||||||
google.golang.org/api v0.269.0 h1:qDrTOxKUQ/P0MveH6a7vZ+DNHxJQjtGm/uvdbdGXCQg=
|
google.golang.org/api v0.272.0 h1:eLUQZGnAS3OHn31URRf9sAmRk3w2JjMx37d2k8AjJmA=
|
||||||
google.golang.org/api v0.269.0/go.mod h1:N8Wpcu23Tlccl0zSHEkcAZQKDLdquxK+l9r2LkwAauE=
|
google.golang.org/api v0.272.0/go.mod h1:wKjowi5LNJc5qarNvDCvNQBn3rVK8nSy6jg2SwRwzIA=
|
||||||
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM=
|
google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5 h1:JNfk58HZ8lfmXbYK2vx/UvsqIL59TzByCxPIX4TDmsE=
|
||||||
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM=
|
google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:x5julN69+ED4PcFk/XWayw35O0lf/nGa4aNgODCmNmw=
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 h1:merA0rdPeUV3YIIfHHcH4qBkiQAc1nfCKSI7lB4cV2M=
|
google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5 h1:CogIeEXn4qWYzzQU0QqvYBM8yDF9cFYzDq9ojSpv0Js=
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I=
|
google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 h1:aJmi6DVGGIStN9Mobk/tZOOQUBbj0BPjZjjnOdoZKts=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
|
||||||
google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY=
|
google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
|
||||||
google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
|
google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
|
||||||
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
||||||
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|
@ -851,30 +882,30 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
honnef.co/go/tools v0.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU=
|
honnef.co/go/tools v0.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU=
|
||||||
honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc=
|
honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc=
|
||||||
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
|
modernc.org/cc/v4 v4.28.4 h1:Hd/4Es+MBj+/7hSdZaisNyu6bv3V0Dp2MdllyfqaH+c=
|
||||||
modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
|
modernc.org/cc/v4 v4.28.4/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
|
||||||
modernc.org/ccgo/v4 v4.32.0 h1:hjG66bI/kqIPX1b2yT6fr/jt+QedtP2fqojG2VrFuVw=
|
modernc.org/ccgo/v4 v4.34.4 h1:OVnSOWQjVKOYkFxoHYB+qQmSHK5gqMqARM+K9DpR/Ws=
|
||||||
modernc.org/ccgo/v4 v4.32.0/go.mod h1:6F08EBCx5uQc38kMGl+0Nm0oWczoo1c7cgpzEry7Uc0=
|
modernc.org/ccgo/v4 v4.34.4/go.mod h1:qdKqE8FNIYyysougB1RX9MxCzp5oJOcQXSobANJ4TuE=
|
||||||
modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
|
modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
|
||||||
modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
|
modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
|
||||||
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
||||||
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
||||||
modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
|
modernc.org/gc/v3 v3.1.3 h1:6QAplYyVO+KdPW3pGnqmJDUxtkec8ooEWvks/hhU3lc=
|
||||||
modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
|
modernc.org/gc/v3 v3.1.3/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
|
||||||
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
||||||
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
||||||
modernc.org/libc v1.70.0 h1:U58NawXqXbgpZ/dcdS9kMshu08aiA6b7gusEusqzNkw=
|
modernc.org/libc v1.73.4 h1:+ra4Ui8ngyt8HDcO1FTDPWlkAh6yOdaO2yAoh8MddQA=
|
||||||
modernc.org/libc v1.70.0/go.mod h1:OVmxFGP1CI/Z4L3E0Q3Mf1PDE0BucwMkcXjjLntvHJo=
|
modernc.org/libc v1.73.4/go.mod h1:DXZ3eO8qMCNn2SnmTNCiC71nJ9Rcq3PsnpU6Vc4rWK8=
|
||||||
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
||||||
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
||||||
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
||||||
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
||||||
modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
|
modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
|
||||||
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
||||||
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
||||||
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
||||||
modernc.org/sqlite v1.48.2 h1:5CnW4uP8joZtA0LedVqLbZV5GD7F/0x91AXeSyjoh5c=
|
modernc.org/sqlite v1.53.0 h1:20WG8N9q4ji/dEqGk4uiI0c6OPjSeLTNYGFCc3+7c1M=
|
||||||
modernc.org/sqlite v1.48.2/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
|
modernc.org/sqlite v1.53.0/go.mod h1:xoEpOIpGrgT48H5iiyt/YXPCZPEzlfmfFwtk8Lklw8s=
|
||||||
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
||||||
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
||||||
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ import (
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
@ -65,11 +66,20 @@ type Config struct {
|
||||||
// Listen is the address to listen on (e.g., ":8080", "127.0.0.1:8080").
|
// Listen is the address to listen on (e.g., ":8080", "127.0.0.1:8080").
|
||||||
Listen string `json:"listen" yaml:"listen"`
|
Listen string `json:"listen" yaml:"listen"`
|
||||||
|
|
||||||
// BaseURL is the public URL where this proxy is accessible.
|
// BaseURL is the public URL where package endpoints are reachable.
|
||||||
// Used for rewriting package metadata URLs.
|
// Used for rewriting package metadata URLs and shown to humans on the
|
||||||
|
// install guide so they know what to point their package manager at.
|
||||||
// Example: "https://proxy.example.com" or "http://localhost:8080"
|
// Example: "https://proxy.example.com" or "http://localhost:8080"
|
||||||
BaseURL string `json:"base_url" yaml:"base_url"`
|
BaseURL string `json:"base_url" yaml:"base_url"`
|
||||||
|
|
||||||
|
// UIBaseURL is the public URL where the web UI is reachable. Defaults to
|
||||||
|
// BaseURL when unset. Set this separately when the UI is served on a
|
||||||
|
// different hostname than the package endpoints — for example, the UI on a
|
||||||
|
// public domain behind auth while build machines hit a Docker network alias
|
||||||
|
// for the package endpoints.
|
||||||
|
// Example: "https://proxy.example.com/ui"
|
||||||
|
UIBaseURL string `json:"ui_base_url" yaml:"ui_base_url"`
|
||||||
|
|
||||||
// Storage configures artifact storage.
|
// Storage configures artifact storage.
|
||||||
Storage StorageConfig `json:"storage" yaml:"storage"`
|
Storage StorageConfig `json:"storage" yaml:"storage"`
|
||||||
|
|
||||||
|
|
@ -95,9 +105,20 @@ type Config struct {
|
||||||
// Default: "5m". Set to "0" to always revalidate.
|
// Default: "5m". Set to "0" to always revalidate.
|
||||||
MetadataTTL string `json:"metadata_ttl" yaml:"metadata_ttl"`
|
MetadataTTL string `json:"metadata_ttl" yaml:"metadata_ttl"`
|
||||||
|
|
||||||
|
// MetadataMaxSize is the maximum size of an upstream metadata response
|
||||||
|
// the proxy will buffer (e.g. "100MB", "250MB"). Responses over this
|
||||||
|
// size return ErrMetadataTooLarge. Default: "100MB".
|
||||||
|
MetadataMaxSize string `json:"metadata_max_size" yaml:"metadata_max_size"`
|
||||||
|
|
||||||
// MirrorAPI enables the /api/mirror endpoints for starting mirror jobs via HTTP.
|
// MirrorAPI enables the /api/mirror endpoints for starting mirror jobs via HTTP.
|
||||||
// Disabled by default to prevent unauthenticated users from triggering downloads.
|
// Disabled by default to prevent unauthenticated users from triggering downloads.
|
||||||
MirrorAPI bool `json:"mirror_api" yaml:"mirror_api"`
|
MirrorAPI bool `json:"mirror_api" yaml:"mirror_api"`
|
||||||
|
|
||||||
|
// Gradle configures Gradle HttpBuildCache behavior.
|
||||||
|
Gradle GradleConfig `json:"gradle" yaml:"gradle"`
|
||||||
|
|
||||||
|
// Health configures the /health endpoint behavior.
|
||||||
|
Health HealthConfig `json:"health" yaml:"health"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CooldownConfig configures version cooldown periods.
|
// CooldownConfig configures version cooldown periods.
|
||||||
|
|
@ -133,6 +154,57 @@ type StorageConfig struct {
|
||||||
// When exceeded, least recently used artifacts are evicted.
|
// When exceeded, least recently used artifacts are evicted.
|
||||||
// Empty or "0" means unlimited.
|
// Empty or "0" means unlimited.
|
||||||
MaxSize string `json:"max_size" yaml:"max_size"`
|
MaxSize string `json:"max_size" yaml:"max_size"`
|
||||||
|
|
||||||
|
// DirectServe enables redirecting cached artifact downloads to presigned
|
||||||
|
// storage URLs (HTTP 302) instead of streaming bytes through the proxy.
|
||||||
|
// Only effective for backends that support URL signing (S3, Azure).
|
||||||
|
DirectServe bool `json:"direct_serve" yaml:"direct_serve"`
|
||||||
|
|
||||||
|
// DirectServeTTL is how long presigned URLs remain valid.
|
||||||
|
// Uses Go duration syntax (e.g. "5m", "1h"). Default: "15m".
|
||||||
|
DirectServeTTL string `json:"direct_serve_ttl" yaml:"direct_serve_ttl"`
|
||||||
|
|
||||||
|
// DirectServeBaseURL overrides the scheme and host of presigned URLs
|
||||||
|
// before returning them to clients. Useful when the proxy reaches
|
||||||
|
// storage at an internal address (e.g. 127.0.0.1 or a Docker hostname)
|
||||||
|
// but clients must use a public one.
|
||||||
|
DirectServeBaseURL string `json:"direct_serve_base_url" yaml:"direct_serve_base_url"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GradleConfig configures Gradle-specific features.
|
||||||
|
type GradleConfig struct {
|
||||||
|
// BuildCache configures the /gradle HttpBuildCache endpoint.
|
||||||
|
BuildCache GradleBuildCacheConfig `json:"build_cache" yaml:"build_cache"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GradleBuildCacheConfig configures Gradle HttpBuildCache safeguards.
|
||||||
|
type GradleBuildCacheConfig struct {
|
||||||
|
// ReadOnly disables PUT uploads and keeps cache reads (GET/HEAD) enabled.
|
||||||
|
ReadOnly bool `json:"read_only" yaml:"read_only"`
|
||||||
|
|
||||||
|
// MaxUploadSize caps a single PUT body size (e.g., "100MB"). Must be > 0.
|
||||||
|
// Default: "100MB".
|
||||||
|
MaxUploadSize string `json:"max_upload_size" yaml:"max_upload_size"`
|
||||||
|
|
||||||
|
// MaxAge evicts entries older than this duration (e.g., "24h", "7d").
|
||||||
|
// Empty or "0" disables age-based eviction.
|
||||||
|
MaxAge string `json:"max_age" yaml:"max_age"`
|
||||||
|
|
||||||
|
// MaxSize evicts oldest entries until total Gradle cache size is <= MaxSize.
|
||||||
|
// Empty or "0" disables size-based eviction.
|
||||||
|
MaxSize string `json:"max_size" yaml:"max_size"`
|
||||||
|
|
||||||
|
// SweepInterval controls periodic eviction frequency.
|
||||||
|
// Default: "10m".
|
||||||
|
SweepInterval string `json:"sweep_interval" yaml:"sweep_interval"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HealthConfig configures the /health endpoint.
|
||||||
|
type HealthConfig struct {
|
||||||
|
// StorageProbeInterval is the minimum time between storage backend probes.
|
||||||
|
// Uses Go duration syntax (e.g. "30s", "1m"). Default: "30s".
|
||||||
|
// Set to "0" to probe on every /health request (useful for low-traffic deployments).
|
||||||
|
StorageProbeInterval string `json:"storage_probe_interval" yaml:"storage_probe_interval"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DatabaseConfig configures the cache database.
|
// DatabaseConfig configures the cache database.
|
||||||
|
|
@ -147,6 +219,21 @@ type DatabaseConfig struct {
|
||||||
URL string `json:"url" yaml:"url"`
|
URL string `json:"url" yaml:"url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// String returns a human-readable description of the configured database
|
||||||
|
// suitable for logging. For postgres the password in the connection URL is
|
||||||
|
// redacted; if the URL cannot be parsed only the driver name is returned to
|
||||||
|
// avoid leaking credentials.
|
||||||
|
func (d DatabaseConfig) String() string {
|
||||||
|
if d.Driver == "postgres" {
|
||||||
|
u, err := url.Parse(d.URL)
|
||||||
|
if err != nil || u.Host == "" {
|
||||||
|
return "postgres"
|
||||||
|
}
|
||||||
|
return u.Redacted()
|
||||||
|
}
|
||||||
|
return d.Path
|
||||||
|
}
|
||||||
|
|
||||||
// LogConfig configures logging.
|
// LogConfig configures logging.
|
||||||
type LogConfig struct {
|
type LogConfig struct {
|
||||||
// Level is the minimum log level: "debug", "info", "warn", "error".
|
// Level is the minimum log level: "debug", "info", "warn", "error".
|
||||||
|
|
@ -163,6 +250,15 @@ type UpstreamConfig struct {
|
||||||
// Default: https://registry.npmjs.org
|
// Default: https://registry.npmjs.org
|
||||||
NPM string `json:"npm" yaml:"npm"`
|
NPM string `json:"npm" yaml:"npm"`
|
||||||
|
|
||||||
|
// Maven is the upstream Maven repository URL.
|
||||||
|
// Default: https://repo1.maven.org/maven2
|
||||||
|
Maven string `json:"maven" yaml:"maven"`
|
||||||
|
|
||||||
|
// GradlePluginPortal is the upstream Gradle Plugin Portal Maven URL.
|
||||||
|
// Used to resolve Gradle plugin marker artifacts.
|
||||||
|
// Default: https://plugins.gradle.org/m2
|
||||||
|
GradlePluginPortal string `json:"gradle_plugin_portal" yaml:"gradle_plugin_portal"`
|
||||||
|
|
||||||
// Cargo is the upstream cargo index URL.
|
// Cargo is the upstream cargo index URL.
|
||||||
// Default: https://index.crates.io
|
// Default: https://index.crates.io
|
||||||
Cargo string `json:"cargo" yaml:"cargo"`
|
Cargo string `json:"cargo" yaml:"cargo"`
|
||||||
|
|
@ -241,9 +337,20 @@ func Default() *Config {
|
||||||
},
|
},
|
||||||
Upstream: UpstreamConfig{
|
Upstream: UpstreamConfig{
|
||||||
NPM: "https://registry.npmjs.org",
|
NPM: "https://registry.npmjs.org",
|
||||||
|
Maven: "https://repo1.maven.org/maven2",
|
||||||
|
GradlePluginPortal: "https://plugins.gradle.org/m2",
|
||||||
Cargo: "https://index.crates.io",
|
Cargo: "https://index.crates.io",
|
||||||
CargoDownload: "https://static.crates.io/crates",
|
CargoDownload: "https://static.crates.io/crates",
|
||||||
},
|
},
|
||||||
|
Gradle: GradleConfig{
|
||||||
|
BuildCache: GradleBuildCacheConfig{
|
||||||
|
ReadOnly: false,
|
||||||
|
MaxUploadSize: defaultGradleMaxUploadSizeStr,
|
||||||
|
MaxAge: "168h",
|
||||||
|
MaxSize: "",
|
||||||
|
SweepInterval: defaultGradleSweepIntervalStr,
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -282,11 +389,13 @@ func Load(path string) (*Config, error) {
|
||||||
// Environment variables use the PROXY_ prefix:
|
// Environment variables use the PROXY_ prefix:
|
||||||
// - PROXY_LISTEN
|
// - PROXY_LISTEN
|
||||||
// - PROXY_BASE_URL
|
// - PROXY_BASE_URL
|
||||||
|
// - PROXY_UI_URL
|
||||||
// - PROXY_STORAGE_PATH
|
// - PROXY_STORAGE_PATH
|
||||||
// - PROXY_STORAGE_MAX_SIZE
|
// - PROXY_STORAGE_MAX_SIZE
|
||||||
// - PROXY_DATABASE_PATH
|
// - PROXY_DATABASE_PATH
|
||||||
// - PROXY_LOG_LEVEL
|
// - PROXY_LOG_LEVEL
|
||||||
// - PROXY_LOG_FORMAT
|
// - PROXY_LOG_FORMAT
|
||||||
|
// - PROXY_HEALTH_STORAGE_PROBE_INTERVAL
|
||||||
func (c *Config) LoadFromEnv() {
|
func (c *Config) LoadFromEnv() {
|
||||||
if v := os.Getenv("PROXY_LISTEN"); v != "" {
|
if v := os.Getenv("PROXY_LISTEN"); v != "" {
|
||||||
c.Listen = v
|
c.Listen = v
|
||||||
|
|
@ -294,6 +403,9 @@ func (c *Config) LoadFromEnv() {
|
||||||
if v := os.Getenv("PROXY_BASE_URL"); v != "" {
|
if v := os.Getenv("PROXY_BASE_URL"); v != "" {
|
||||||
c.BaseURL = v
|
c.BaseURL = v
|
||||||
}
|
}
|
||||||
|
if v := os.Getenv("PROXY_UI_URL"); v != "" {
|
||||||
|
c.UIBaseURL = v
|
||||||
|
}
|
||||||
if v := os.Getenv("PROXY_STORAGE_URL"); v != "" {
|
if v := os.Getenv("PROXY_STORAGE_URL"); v != "" {
|
||||||
c.Storage.URL = v
|
c.Storage.URL = v
|
||||||
}
|
}
|
||||||
|
|
@ -303,6 +415,15 @@ func (c *Config) LoadFromEnv() {
|
||||||
if v := os.Getenv("PROXY_STORAGE_MAX_SIZE"); v != "" {
|
if v := os.Getenv("PROXY_STORAGE_MAX_SIZE"); v != "" {
|
||||||
c.Storage.MaxSize = v
|
c.Storage.MaxSize = v
|
||||||
}
|
}
|
||||||
|
if v := os.Getenv("PROXY_STORAGE_DIRECT_SERVE"); v != "" {
|
||||||
|
c.Storage.DirectServe = envBool(v)
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_STORAGE_DIRECT_SERVE_TTL"); v != "" {
|
||||||
|
c.Storage.DirectServeTTL = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_STORAGE_DIRECT_SERVE_BASE_URL"); v != "" {
|
||||||
|
c.Storage.DirectServeBaseURL = v
|
||||||
|
}
|
||||||
if v := os.Getenv("PROXY_DATABASE_DRIVER"); v != "" {
|
if v := os.Getenv("PROXY_DATABASE_DRIVER"); v != "" {
|
||||||
c.Database.Driver = v
|
c.Database.Driver = v
|
||||||
}
|
}
|
||||||
|
|
@ -318,18 +439,55 @@ func (c *Config) LoadFromEnv() {
|
||||||
if v := os.Getenv("PROXY_LOG_FORMAT"); v != "" {
|
if v := os.Getenv("PROXY_LOG_FORMAT"); v != "" {
|
||||||
c.Log.Format = v
|
c.Log.Format = v
|
||||||
}
|
}
|
||||||
|
if v := os.Getenv("PROXY_UPSTREAM_MAVEN"); v != "" {
|
||||||
|
c.Upstream.Maven = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_UPSTREAM_GRADLE_PLUGIN_PORTAL"); v != "" {
|
||||||
|
c.Upstream.GradlePluginPortal = v
|
||||||
|
}
|
||||||
if v := os.Getenv("PROXY_COOLDOWN_DEFAULT"); v != "" {
|
if v := os.Getenv("PROXY_COOLDOWN_DEFAULT"); v != "" {
|
||||||
c.Cooldown.Default = v
|
c.Cooldown.Default = v
|
||||||
}
|
}
|
||||||
if v := os.Getenv("PROXY_CACHE_METADATA"); v != "" {
|
if v := os.Getenv("PROXY_CACHE_METADATA"); v != "" {
|
||||||
c.CacheMetadata = v == "true" || v == "1"
|
c.CacheMetadata = envBool(v)
|
||||||
}
|
}
|
||||||
if v := os.Getenv("PROXY_MIRROR_API"); v != "" {
|
if v := os.Getenv("PROXY_MIRROR_API"); v != "" {
|
||||||
c.MirrorAPI = v == "true" || v == "1"
|
c.MirrorAPI = envBool(v)
|
||||||
}
|
}
|
||||||
if v := os.Getenv("PROXY_METADATA_TTL"); v != "" {
|
if v := os.Getenv("PROXY_METADATA_TTL"); v != "" {
|
||||||
c.MetadataTTL = v
|
c.MetadataTTL = v
|
||||||
}
|
}
|
||||||
|
if v := os.Getenv("PROXY_METADATA_MAX_SIZE"); v != "" {
|
||||||
|
c.MetadataMaxSize = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_GRADLE_BUILD_CACHE_READ_ONLY"); v != "" {
|
||||||
|
c.Gradle.BuildCache.ReadOnly = v == "true" || v == "1"
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_GRADLE_BUILD_CACHE_MAX_UPLOAD_SIZE"); v != "" {
|
||||||
|
c.Gradle.BuildCache.MaxUploadSize = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_GRADLE_BUILD_CACHE_MAX_AGE"); v != "" {
|
||||||
|
c.Gradle.BuildCache.MaxAge = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_GRADLE_BUILD_CACHE_MAX_SIZE"); v != "" {
|
||||||
|
c.Gradle.BuildCache.MaxSize = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_GRADLE_BUILD_CACHE_SWEEP_INTERVAL"); v != "" {
|
||||||
|
c.Gradle.BuildCache.SweepInterval = v
|
||||||
|
}
|
||||||
|
if v := os.Getenv("PROXY_HEALTH_STORAGE_PROBE_INTERVAL"); v != "" {
|
||||||
|
c.Health.StorageProbeInterval = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// validateAbsoluteURL returns an error if value is not a parseable URL with
|
||||||
|
// both a scheme and host. fieldName is used in the error message.
|
||||||
|
func validateAbsoluteURL(fieldName, value string) error {
|
||||||
|
u, err := url.Parse(value)
|
||||||
|
if err != nil || u.Scheme == "" || u.Host == "" {
|
||||||
|
return fmt.Errorf("invalid %s %q: must be an absolute URL", fieldName, value)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate checks the configuration for errors.
|
// Validate checks the configuration for errors.
|
||||||
|
|
@ -340,6 +498,11 @@ func (c *Config) Validate() error {
|
||||||
if c.BaseURL == "" {
|
if c.BaseURL == "" {
|
||||||
return fmt.Errorf("base_url is required")
|
return fmt.Errorf("base_url is required")
|
||||||
}
|
}
|
||||||
|
if c.UIBaseURL == "" {
|
||||||
|
c.UIBaseURL = c.BaseURL
|
||||||
|
} else if err := validateAbsoluteURL("ui_base_url", c.UIBaseURL); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
if c.Storage.URL == "" && c.Storage.Path == "" {
|
if c.Storage.URL == "" && c.Storage.Path == "" {
|
||||||
return fmt.Errorf("storage.url or storage.path is required")
|
return fmt.Errorf("storage.url or storage.path is required")
|
||||||
}
|
}
|
||||||
|
|
@ -379,6 +542,20 @@ func (c *Config) Validate() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Validate direct serve TTL if specified
|
||||||
|
if c.Storage.DirectServeTTL != "" {
|
||||||
|
if _, err := time.ParseDuration(c.Storage.DirectServeTTL); err != nil {
|
||||||
|
return fmt.Errorf("invalid storage.direct_serve_ttl %q: %w", c.Storage.DirectServeTTL, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate direct serve base URL if specified
|
||||||
|
if c.Storage.DirectServeBaseURL != "" {
|
||||||
|
if err := validateAbsoluteURL("storage.direct_serve_base_url", c.Storage.DirectServeBaseURL); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Validate metadata TTL if specified
|
// Validate metadata TTL if specified
|
||||||
if c.MetadataTTL != "" && c.MetadataTTL != "0" {
|
if c.MetadataTTL != "" && c.MetadataTTL != "0" {
|
||||||
if _, err := time.ParseDuration(c.MetadataTTL); err != nil {
|
if _, err := time.ParseDuration(c.MetadataTTL); err != nil {
|
||||||
|
|
@ -386,10 +563,85 @@ func (c *Config) Validate() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := validateMetadataMaxSize(c.MetadataMaxSize); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := c.Health.Validate(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := c.Gradle.BuildCache.Validate(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultMetadataTTL = 5 * time.Minute //nolint:mnd // sensible default
|
// Validate checks the /health configuration. An unset interval is allowed
|
||||||
|
// (the cache uses its default); explicit values must parse and be non-negative.
|
||||||
|
func (h *HealthConfig) Validate() error {
|
||||||
|
if h.StorageProbeInterval == "" || h.StorageProbeInterval == "0" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d, err := time.ParseDuration(h.StorageProbeInterval)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid health.storage_probe_interval %q: %w", h.StorageProbeInterval, err)
|
||||||
|
}
|
||||||
|
if d < 0 {
|
||||||
|
return fmt.Errorf("invalid health.storage_probe_interval %q: must be non-negative", h.StorageProbeInterval)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate checks Gradle build cache settings, applying the default upload
|
||||||
|
// size if unset.
|
||||||
|
func (g *GradleBuildCacheConfig) Validate() error {
|
||||||
|
if g.MaxUploadSize == "" {
|
||||||
|
g.MaxUploadSize = defaultGradleMaxUploadSizeStr
|
||||||
|
}
|
||||||
|
uploadSize, err := ParseSize(g.MaxUploadSize)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.max_upload_size: %w", err)
|
||||||
|
}
|
||||||
|
if uploadSize <= 0 {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.max_upload_size %q: must be > 0", g.MaxUploadSize)
|
||||||
|
}
|
||||||
|
|
||||||
|
if g.MaxAge != "" && g.MaxAge != "0" {
|
||||||
|
if _, err := time.ParseDuration(g.MaxAge); err != nil {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.max_age %q: %w", g.MaxAge, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if g.MaxSize != "" {
|
||||||
|
if _, err := ParseSize(g.MaxSize); err != nil {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.max_size: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if g.SweepInterval != "" {
|
||||||
|
d, err := time.ParseDuration(g.SweepInterval)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.sweep_interval %q: %w", g.SweepInterval, err)
|
||||||
|
}
|
||||||
|
if d <= 0 {
|
||||||
|
return fmt.Errorf("invalid gradle.build_cache.sweep_interval %q: must be > 0", g.SweepInterval)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultMetadataTTL = 5 * time.Minute //nolint:mnd // sensible default
|
||||||
|
defaultDirectServeTTL = 15 * time.Minute //nolint:mnd // sensible default
|
||||||
|
defaultMetadataMaxSize = 100 << 20
|
||||||
|
defaultGradleBuildCacheMaxUploadSize = 100 << 20
|
||||||
|
defaultGradleBuildCacheSweepInterval = 10 * time.Minute
|
||||||
|
defaultGradleMaxUploadSizeStr = "100MB"
|
||||||
|
defaultGradleSweepIntervalStr = "10m"
|
||||||
|
)
|
||||||
|
|
||||||
// ParseMaxSize returns the maximum cache size in bytes.
|
// ParseMaxSize returns the maximum cache size in bytes.
|
||||||
// Returns 0 if unset or explicitly disabled (meaning unlimited).
|
// Returns 0 if unset or explicitly disabled (meaning unlimited).
|
||||||
|
|
@ -404,6 +656,33 @@ func (c *Config) ParseMaxSize() int64 {
|
||||||
return size
|
return size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func validateMetadataMaxSize(s string) error {
|
||||||
|
if s == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
size, err := ParseSize(s)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid metadata_max_size: %w", err)
|
||||||
|
}
|
||||||
|
if size <= 0 {
|
||||||
|
return fmt.Errorf("invalid metadata_max_size %q: must be positive", s)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseMetadataMaxSize returns the maximum metadata response size in bytes.
|
||||||
|
// Returns 100MB if unset or invalid.
|
||||||
|
func (c *Config) ParseMetadataMaxSize() int64 {
|
||||||
|
if c.MetadataMaxSize == "" {
|
||||||
|
return defaultMetadataMaxSize
|
||||||
|
}
|
||||||
|
size, err := ParseSize(c.MetadataMaxSize)
|
||||||
|
if err != nil || size <= 0 {
|
||||||
|
return defaultMetadataMaxSize
|
||||||
|
}
|
||||||
|
return size
|
||||||
|
}
|
||||||
|
|
||||||
// ParseMetadataTTL returns the metadata TTL duration.
|
// ParseMetadataTTL returns the metadata TTL duration.
|
||||||
// Returns 5 minutes if unset, 0 if explicitly disabled.
|
// Returns 5 minutes if unset, 0 if explicitly disabled.
|
||||||
func (c *Config) ParseMetadataTTL() time.Duration {
|
func (c *Config) ParseMetadataTTL() time.Duration {
|
||||||
|
|
@ -420,6 +699,71 @@ func (c *Config) ParseMetadataTTL() time.Duration {
|
||||||
return d
|
return d
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ParseGradleBuildCacheMaxUploadSize returns the max accepted PUT body size.
|
||||||
|
// Defaults to 100MB if unset or invalid.
|
||||||
|
func (c *Config) ParseGradleBuildCacheMaxUploadSize() int64 {
|
||||||
|
if c.Gradle.BuildCache.MaxUploadSize == "" {
|
||||||
|
return defaultGradleBuildCacheMaxUploadSize
|
||||||
|
}
|
||||||
|
size, err := ParseSize(c.Gradle.BuildCache.MaxUploadSize)
|
||||||
|
if err != nil || size <= 0 {
|
||||||
|
return defaultGradleBuildCacheMaxUploadSize
|
||||||
|
}
|
||||||
|
return size
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseGradleBuildCacheMaxAge returns age-based eviction threshold.
|
||||||
|
// Returns 0 when disabled or invalid.
|
||||||
|
func (c *Config) ParseGradleBuildCacheMaxAge() time.Duration {
|
||||||
|
if c.Gradle.BuildCache.MaxAge == "" || c.Gradle.BuildCache.MaxAge == "0" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
d, err := time.ParseDuration(c.Gradle.BuildCache.MaxAge)
|
||||||
|
if err != nil || d <= 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseGradleBuildCacheMaxSize returns total-size cap in bytes.
|
||||||
|
// Returns 0 when disabled or invalid.
|
||||||
|
func (c *Config) ParseGradleBuildCacheMaxSize() int64 {
|
||||||
|
if c.Gradle.BuildCache.MaxSize == "" || c.Gradle.BuildCache.MaxSize == "0" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
size, err := ParseSize(c.Gradle.BuildCache.MaxSize)
|
||||||
|
if err != nil || size <= 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return size
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseGradleBuildCacheSweepInterval returns eviction sweep cadence.
|
||||||
|
// Defaults to 10m if unset or invalid.
|
||||||
|
func (c *Config) ParseGradleBuildCacheSweepInterval() time.Duration {
|
||||||
|
if c.Gradle.BuildCache.SweepInterval == "" {
|
||||||
|
return defaultGradleBuildCacheSweepInterval
|
||||||
|
}
|
||||||
|
d, err := time.ParseDuration(c.Gradle.BuildCache.SweepInterval)
|
||||||
|
if err != nil || d <= 0 {
|
||||||
|
return defaultGradleBuildCacheSweepInterval
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseDirectServeTTL returns the presigned URL expiry duration.
|
||||||
|
// Returns 15 minutes if unset.
|
||||||
|
func (c *Config) ParseDirectServeTTL() time.Duration {
|
||||||
|
if c.Storage.DirectServeTTL == "" {
|
||||||
|
return defaultDirectServeTTL
|
||||||
|
}
|
||||||
|
d, err := time.ParseDuration(c.Storage.DirectServeTTL)
|
||||||
|
if err != nil {
|
||||||
|
return defaultDirectServeTTL
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
// ParseSize parses a human-readable size string (e.g., "10GB", "500MB").
|
// ParseSize parses a human-readable size string (e.g., "10GB", "500MB").
|
||||||
// Returns the size in bytes.
|
// Returns the size in bytes.
|
||||||
func ParseSize(s string) (int64, error) {
|
func ParseSize(s string) (int64, error) {
|
||||||
|
|
@ -500,3 +844,7 @@ func (a *AuthConfig) Header() (name, value string) {
|
||||||
func expandEnv(s string) string {
|
func expandEnv(s string) string {
|
||||||
return os.Expand(s, os.Getenv)
|
return os.Expand(s, os.Getenv)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func envBool(v string) bool {
|
||||||
|
return v == "true" || v == "1"
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,18 @@ func TestDefault(t *testing.T) {
|
||||||
if cfg.Database.Path == "" {
|
if cfg.Database.Path == "" {
|
||||||
t.Error("Database.Path should not be empty")
|
t.Error("Database.Path should not be empty")
|
||||||
}
|
}
|
||||||
|
if cfg.Gradle.BuildCache.MaxUploadSize != "100MB" {
|
||||||
|
t.Errorf("Gradle.BuildCache.MaxUploadSize = %q, want %q", cfg.Gradle.BuildCache.MaxUploadSize, "100MB")
|
||||||
|
}
|
||||||
|
if cfg.Gradle.BuildCache.MaxAge != "168h" {
|
||||||
|
t.Errorf("Gradle.BuildCache.MaxAge = %q, want %q", cfg.Gradle.BuildCache.MaxAge, "168h")
|
||||||
|
}
|
||||||
|
if cfg.Upstream.Maven != "https://repo1.maven.org/maven2" {
|
||||||
|
t.Errorf("Upstream.Maven = %q, want %q", cfg.Upstream.Maven, "https://repo1.maven.org/maven2")
|
||||||
|
}
|
||||||
|
if cfg.Upstream.GradlePluginPortal != "https://plugins.gradle.org/m2" {
|
||||||
|
t.Errorf("Upstream.GradlePluginPortal = %q, want %q", cfg.Upstream.GradlePluginPortal, "https://plugins.gradle.org/m2")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestValidate(t *testing.T) {
|
func TestValidate(t *testing.T) {
|
||||||
|
|
@ -98,6 +110,41 @@ func TestValidate(t *testing.T) {
|
||||||
modify: func(c *Config) { c.Storage.MaxSize = "10GB" },
|
modify: func(c *Config) { c.Storage.MaxSize = "10GB" },
|
||||||
wantErr: false,
|
wantErr: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "invalid gradle upload size",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.MaxUploadSize = testInvalid },
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "zero gradle upload size",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.MaxUploadSize = "0" },
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid gradle max age",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.MaxAge = testInvalid },
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "valid gradle max age",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.MaxAge = "24h" },
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid gradle max size",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.MaxSize = testInvalid },
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid gradle sweep interval",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.SweepInterval = "0" },
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "valid gradle sweep interval",
|
||||||
|
modify: func(c *Config) { c.Gradle.BuildCache.SweepInterval = "30m" },
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
@ -221,8 +268,16 @@ func TestLoadFromEnv(t *testing.T) {
|
||||||
|
|
||||||
t.Setenv("PROXY_LISTEN", ":9000")
|
t.Setenv("PROXY_LISTEN", ":9000")
|
||||||
t.Setenv("PROXY_BASE_URL", "https://env.example.com")
|
t.Setenv("PROXY_BASE_URL", "https://env.example.com")
|
||||||
|
t.Setenv("PROXY_UI_URL", "https://ui.env.example.com/ui")
|
||||||
t.Setenv("PROXY_STORAGE_PATH", "/env/cache")
|
t.Setenv("PROXY_STORAGE_PATH", "/env/cache")
|
||||||
t.Setenv("PROXY_LOG_LEVEL", testLevelDebug)
|
t.Setenv("PROXY_LOG_LEVEL", testLevelDebug)
|
||||||
|
t.Setenv("PROXY_UPSTREAM_MAVEN", "https://maven.example.com/repository/maven-public")
|
||||||
|
t.Setenv("PROXY_UPSTREAM_GRADLE_PLUGIN_PORTAL", "https://plugins.example.com/m2")
|
||||||
|
t.Setenv("PROXY_GRADLE_BUILD_CACHE_READ_ONLY", "true")
|
||||||
|
t.Setenv("PROXY_GRADLE_BUILD_CACHE_MAX_UPLOAD_SIZE", "32MB")
|
||||||
|
t.Setenv("PROXY_GRADLE_BUILD_CACHE_MAX_AGE", "12h")
|
||||||
|
t.Setenv("PROXY_GRADLE_BUILD_CACHE_MAX_SIZE", "10GB")
|
||||||
|
t.Setenv("PROXY_GRADLE_BUILD_CACHE_SWEEP_INTERVAL", "15m")
|
||||||
|
|
||||||
cfg.LoadFromEnv()
|
cfg.LoadFromEnv()
|
||||||
|
|
||||||
|
|
@ -232,12 +287,36 @@ func TestLoadFromEnv(t *testing.T) {
|
||||||
if cfg.BaseURL != "https://env.example.com" {
|
if cfg.BaseURL != "https://env.example.com" {
|
||||||
t.Errorf("BaseURL = %q, want %q", cfg.BaseURL, "https://env.example.com")
|
t.Errorf("BaseURL = %q, want %q", cfg.BaseURL, "https://env.example.com")
|
||||||
}
|
}
|
||||||
|
if cfg.UIBaseURL != "https://ui.env.example.com/ui" {
|
||||||
|
t.Errorf("UIBaseURL = %q, want %q", cfg.UIBaseURL, "https://ui.env.example.com/ui")
|
||||||
|
}
|
||||||
if cfg.Storage.Path != "/env/cache" {
|
if cfg.Storage.Path != "/env/cache" {
|
||||||
t.Errorf("Storage.Path = %q, want %q", cfg.Storage.Path, "/env/cache")
|
t.Errorf("Storage.Path = %q, want %q", cfg.Storage.Path, "/env/cache")
|
||||||
}
|
}
|
||||||
if cfg.Log.Level != testLevelDebug {
|
if cfg.Log.Level != testLevelDebug {
|
||||||
t.Errorf("Log.Level = %q, want %q", cfg.Log.Level, testLevelDebug)
|
t.Errorf("Log.Level = %q, want %q", cfg.Log.Level, testLevelDebug)
|
||||||
}
|
}
|
||||||
|
if cfg.Upstream.Maven != "https://maven.example.com/repository/maven-public" {
|
||||||
|
t.Errorf("Upstream.Maven = %q, want %q", cfg.Upstream.Maven, "https://maven.example.com/repository/maven-public")
|
||||||
|
}
|
||||||
|
if cfg.Upstream.GradlePluginPortal != "https://plugins.example.com/m2" {
|
||||||
|
t.Errorf("Upstream.GradlePluginPortal = %q, want %q", cfg.Upstream.GradlePluginPortal, "https://plugins.example.com/m2")
|
||||||
|
}
|
||||||
|
if !cfg.Gradle.BuildCache.ReadOnly {
|
||||||
|
t.Error("Gradle.BuildCache.ReadOnly = false, want true")
|
||||||
|
}
|
||||||
|
if cfg.Gradle.BuildCache.MaxUploadSize != "32MB" {
|
||||||
|
t.Errorf("Gradle.BuildCache.MaxUploadSize = %q, want %q", cfg.Gradle.BuildCache.MaxUploadSize, "32MB")
|
||||||
|
}
|
||||||
|
if cfg.Gradle.BuildCache.MaxAge != "12h" {
|
||||||
|
t.Errorf("Gradle.BuildCache.MaxAge = %q, want %q", cfg.Gradle.BuildCache.MaxAge, "12h")
|
||||||
|
}
|
||||||
|
if cfg.Gradle.BuildCache.MaxSize != "10GB" {
|
||||||
|
t.Errorf("Gradle.BuildCache.MaxSize = %q, want %q", cfg.Gradle.BuildCache.MaxSize, "10GB")
|
||||||
|
}
|
||||||
|
if cfg.Gradle.BuildCache.SweepInterval != "15m" {
|
||||||
|
t.Errorf("Gradle.BuildCache.SweepInterval = %q, want %q", cfg.Gradle.BuildCache.SweepInterval, "15m")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadCooldownConfig(t *testing.T) {
|
func TestLoadCooldownConfig(t *testing.T) {
|
||||||
|
|
@ -353,6 +432,52 @@ func TestParseMetadataTTL(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseMetadataMaxSize(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
size string
|
||||||
|
want int64
|
||||||
|
}{
|
||||||
|
{"unset uses default", "", defaultMetadataMaxSize},
|
||||||
|
{"explicit value", "250MB", 250 << 20},
|
||||||
|
{"bytes", "1024", 1024},
|
||||||
|
{"invalid uses default", "lots", defaultMetadataMaxSize},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.MetadataMaxSize = tt.size
|
||||||
|
got := cfg.ParseMetadataMaxSize()
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf("ParseMetadataMaxSize() = %d, want %d", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateMetadataMaxSize(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.MetadataMaxSize = "not-a-size"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for invalid metadata_max_size")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.MetadataMaxSize = "0"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for zero metadata_max_size")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.MetadataMaxSize = "250MB"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for valid metadata_max_size: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.MetadataMaxSize = ""
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for unset metadata_max_size: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestValidateMetadataTTL(t *testing.T) {
|
func TestValidateMetadataTTL(t *testing.T) {
|
||||||
cfg := Default()
|
cfg := Default()
|
||||||
cfg.MetadataTTL = "invalid"
|
cfg.MetadataTTL = "invalid"
|
||||||
|
|
@ -371,6 +496,34 @@ func TestValidateMetadataTTL(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestValidateHealthStorageProbeInterval(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.Health.StorageProbeInterval = "not-a-duration"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for invalid health.storage_probe_interval")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Health.StorageProbeInterval = "30s"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for valid health.storage_probe_interval: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Health.StorageProbeInterval = "0"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for zero health.storage_probe_interval: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Health.StorageProbeInterval = ""
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for empty health.storage_probe_interval: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Health.StorageProbeInterval = "-5s"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for negative health.storage_probe_interval")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoadMetadataTTLFromEnv(t *testing.T) {
|
func TestLoadMetadataTTLFromEnv(t *testing.T) {
|
||||||
cfg := Default()
|
cfg := Default()
|
||||||
t.Setenv("PROXY_METADATA_TTL", "10m")
|
t.Setenv("PROXY_METADATA_TTL", "10m")
|
||||||
|
|
@ -380,3 +533,167 @@ func TestLoadMetadataTTLFromEnv(t *testing.T) {
|
||||||
t.Errorf("MetadataTTL = %q, want %q", cfg.MetadataTTL, "10m")
|
t.Errorf("MetadataTTL = %q, want %q", cfg.MetadataTTL, "10m")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseGradleBuildCacheConfig(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxUploadSize(); got != 100*1024*1024 {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxUploadSize() = %d, want %d", got, 100*1024*1024)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxAge(); got != 168*time.Hour {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxAge() = %v, want %v", got, 168*time.Hour)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxSize(); got != 0 {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxSize() = %d, want 0", got)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheSweepInterval(); got != 10*time.Minute {
|
||||||
|
t.Errorf("ParseGradleBuildCacheSweepInterval() = %v, want %v", got, 10*time.Minute)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Gradle.BuildCache.MaxUploadSize = "64MB"
|
||||||
|
cfg.Gradle.BuildCache.MaxAge = "48h"
|
||||||
|
cfg.Gradle.BuildCache.MaxSize = "2GB"
|
||||||
|
cfg.Gradle.BuildCache.SweepInterval = "20m"
|
||||||
|
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxUploadSize(); got != 64*1024*1024 {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxUploadSize() = %d, want %d", got, 64*1024*1024)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxAge(); got != 48*time.Hour {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxAge() = %v, want %v", got, 48*time.Hour)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheMaxSize(); got != 2*1024*1024*1024 {
|
||||||
|
t.Errorf("ParseGradleBuildCacheMaxSize() = %d, want %d", got, 2*1024*1024*1024)
|
||||||
|
}
|
||||||
|
if got := cfg.ParseGradleBuildCacheSweepInterval(); got != 20*time.Minute {
|
||||||
|
t.Errorf("ParseGradleBuildCacheSweepInterval() = %v, want %v", got, 20*time.Minute)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseDirectServeTTL(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
ttl string
|
||||||
|
want time.Duration
|
||||||
|
}{
|
||||||
|
{"empty defaults to 15m", "", 15 * time.Minute},
|
||||||
|
{"5 minutes", "5m", 5 * time.Minute},
|
||||||
|
{"1 hour", "1h", 1 * time.Hour},
|
||||||
|
{"invalid defaults to 15m", "not-a-duration", 15 * time.Minute},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.Storage.DirectServeTTL = tt.ttl
|
||||||
|
got := cfg.ParseDirectServeTTL()
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf("ParseDirectServeTTL() = %v, want %v", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateDirectServeTTL(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.Storage.DirectServeTTL = "invalid"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for invalid storage.direct_serve_ttl")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Storage.DirectServeTTL = "5m"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for valid storage.direct_serve_ttl: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadDirectServeFromEnv(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
t.Setenv("PROXY_STORAGE_DIRECT_SERVE", "true")
|
||||||
|
t.Setenv("PROXY_STORAGE_DIRECT_SERVE_TTL", "30m")
|
||||||
|
t.Setenv("PROXY_STORAGE_DIRECT_SERVE_BASE_URL", "https://cdn.example.com")
|
||||||
|
cfg.LoadFromEnv()
|
||||||
|
|
||||||
|
if !cfg.Storage.DirectServe {
|
||||||
|
t.Error("Storage.DirectServe should be true")
|
||||||
|
}
|
||||||
|
if cfg.Storage.DirectServeTTL != "30m" {
|
||||||
|
t.Errorf("Storage.DirectServeTTL = %q, want %q", cfg.Storage.DirectServeTTL, "30m")
|
||||||
|
}
|
||||||
|
if cfg.Storage.DirectServeBaseURL != "https://cdn.example.com" {
|
||||||
|
t.Errorf("Storage.DirectServeBaseURL = %q, want %q", cfg.Storage.DirectServeBaseURL, "https://cdn.example.com")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateUIBaseURLDefaultsToBaseURL(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
cfg.BaseURL = "https://proxy.example.com"
|
||||||
|
cfg.UIBaseURL = ""
|
||||||
|
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Fatalf("unexpected validation error: %v", err)
|
||||||
|
}
|
||||||
|
if cfg.UIBaseURL != "https://proxy.example.com" {
|
||||||
|
t.Errorf("UIBaseURL = %q, want it to default to BaseURL %q", cfg.UIBaseURL, "https://proxy.example.com")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateUIBaseURL(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
|
||||||
|
cfg.UIBaseURL = "not a url"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for relative ui_base_url")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg = Default()
|
||||||
|
cfg.UIBaseURL = "://bad"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for unparseable ui_base_url")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg = Default()
|
||||||
|
cfg.UIBaseURL = "https://ui.example.com/ui"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for valid ui_base_url: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateDirectServeBaseURL(t *testing.T) {
|
||||||
|
cfg := Default()
|
||||||
|
|
||||||
|
cfg.Storage.DirectServeBaseURL = "not a url"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for relative direct_serve_base_url")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Storage.DirectServeBaseURL = "://bad"
|
||||||
|
if err := cfg.Validate(); err == nil {
|
||||||
|
t.Error("expected validation error for unparseable direct_serve_base_url")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Storage.DirectServeBaseURL = "https://cdn.example.com"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Errorf("unexpected error for valid direct_serve_base_url: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDatabaseConfigString(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
cfg DatabaseConfig
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"sqlite", DatabaseConfig{Driver: "sqlite", Path: "./cache/proxy.db"}, "./cache/proxy.db"},
|
||||||
|
{"default driver", DatabaseConfig{Path: "/var/lib/proxy.db"}, "/var/lib/proxy.db"},
|
||||||
|
{"postgres no password", DatabaseConfig{Driver: "postgres", URL: "postgres://user@localhost:5432/proxy"}, "postgres://user@localhost:5432/proxy"},
|
||||||
|
{"postgres redacts password", DatabaseConfig{Driver: "postgres", URL: "postgres://user:secret@localhost:5432/proxy?sslmode=disable"}, "postgres://user:xxxxx@localhost:5432/proxy?sslmode=disable"},
|
||||||
|
{"postgres unparseable url", DatabaseConfig{Driver: "postgres", URL: "host=localhost user=foo password=bar"}, "postgres"},
|
||||||
|
{"postgres ignores sqlite path", DatabaseConfig{Driver: "postgres", URL: "postgres://localhost/db", Path: "./cache/proxy.db"}, "postgres://localhost/db"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := tt.cfg.String(); got != tt.want {
|
||||||
|
t.Errorf("%s: String() = %q, want %q", tt.name, got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,125 +0,0 @@
|
||||||
package cooldown
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
const hoursPerDay = 24
|
|
||||||
|
|
||||||
// Config holds cooldown settings for version filtering.
|
|
||||||
// Cooldown hides package versions published too recently, giving the community
|
|
||||||
// time to spot malicious releases before they're pulled into projects.
|
|
||||||
type Config struct {
|
|
||||||
// Default is the global default cooldown duration (e.g., "3d", "48h").
|
|
||||||
Default string `json:"default" yaml:"default"`
|
|
||||||
|
|
||||||
// Ecosystems overrides the default for specific ecosystems.
|
|
||||||
// Keys are ecosystem names (e.g., "npm", "pypi").
|
|
||||||
Ecosystems map[string]string `json:"ecosystems" yaml:"ecosystems"`
|
|
||||||
|
|
||||||
// Packages overrides the cooldown for specific packages.
|
|
||||||
// Keys are PURLs (e.g., "pkg:npm/lodash", "pkg:npm/@babel/core").
|
|
||||||
Packages map[string]string `json:"packages" yaml:"packages"`
|
|
||||||
|
|
||||||
defaultDuration time.Duration
|
|
||||||
ecosystemDurations map[string]time.Duration
|
|
||||||
packageDurations map[string]time.Duration
|
|
||||||
parsed bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// parse resolves all string durations into time.Duration values.
|
|
||||||
// Called lazily on first use.
|
|
||||||
func (c *Config) parse() {
|
|
||||||
if c.parsed {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.parsed = true
|
|
||||||
|
|
||||||
c.defaultDuration, _ = ParseDuration(c.Default)
|
|
||||||
|
|
||||||
c.ecosystemDurations = make(map[string]time.Duration, len(c.Ecosystems))
|
|
||||||
for k, v := range c.Ecosystems {
|
|
||||||
d, _ := ParseDuration(v)
|
|
||||||
c.ecosystemDurations[k] = d
|
|
||||||
}
|
|
||||||
|
|
||||||
c.packageDurations = make(map[string]time.Duration, len(c.Packages))
|
|
||||||
for k, v := range c.Packages {
|
|
||||||
d, _ := ParseDuration(v)
|
|
||||||
c.packageDurations[k] = d
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// For returns the effective cooldown duration for a given ecosystem and package PURL.
|
|
||||||
// Resolution order: package override > ecosystem override > global default.
|
|
||||||
func (c *Config) For(ecosystem, packagePURL string) time.Duration {
|
|
||||||
c.parse()
|
|
||||||
|
|
||||||
if d, ok := c.packageDurations[packagePURL]; ok {
|
|
||||||
return d
|
|
||||||
}
|
|
||||||
if d, ok := c.ecosystemDurations[ecosystem]; ok {
|
|
||||||
return d
|
|
||||||
}
|
|
||||||
return c.defaultDuration
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsAllowed returns true if a version with the given publish time has passed
|
|
||||||
// the cooldown period for this ecosystem/package.
|
|
||||||
func (c *Config) IsAllowed(ecosystem, packagePURL string, publishedAt time.Time) bool {
|
|
||||||
d := c.For(ecosystem, packagePURL)
|
|
||||||
if d == 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if publishedAt.IsZero() {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return time.Since(publishedAt) >= d
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enabled returns true if any cooldown is configured.
|
|
||||||
func (c *Config) Enabled() bool {
|
|
||||||
c.parse()
|
|
||||||
if c.defaultDuration > 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
for _, d := range c.ecosystemDurations {
|
|
||||||
if d > 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, d := range c.packageDurations {
|
|
||||||
if d > 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseDuration parses a duration string supporting days (e.g., "3d"),
|
|
||||||
// in addition to Go's standard time.ParseDuration formats ("48h", "30m").
|
|
||||||
// "0" means disabled (returns 0).
|
|
||||||
func ParseDuration(s string) (time.Duration, error) {
|
|
||||||
s = strings.TrimSpace(s)
|
|
||||||
if s == "" || s == "0" {
|
|
||||||
return 0, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle day suffix
|
|
||||||
if numStr, ok := strings.CutSuffix(s, "d"); ok {
|
|
||||||
days, err := strconv.ParseFloat(numStr, 64)
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("invalid duration %q: %w", s, err)
|
|
||||||
}
|
|
||||||
return time.Duration(days * float64(hoursPerDay*time.Hour)), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
d, err := time.ParseDuration(s)
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("invalid duration %q: %w", s, err)
|
|
||||||
}
|
|
||||||
return d, nil
|
|
||||||
}
|
|
||||||
|
|
@ -1,133 +0,0 @@
|
||||||
package cooldown
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestParseDuration(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
input string
|
|
||||||
want time.Duration
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{"", 0, false},
|
|
||||||
{"0", 0, false},
|
|
||||||
{"3d", 3 * 24 * time.Hour, false},
|
|
||||||
{"7d", 7 * 24 * time.Hour, false},
|
|
||||||
{"14d", 14 * 24 * time.Hour, false},
|
|
||||||
{"1.5d", 36 * time.Hour, false},
|
|
||||||
{"48h", 48 * time.Hour, false},
|
|
||||||
{"30m", 30 * time.Minute, false},
|
|
||||||
{"1h30m", 90 * time.Minute, false},
|
|
||||||
{"invalid", 0, true},
|
|
||||||
{"d", 0, true},
|
|
||||||
{"xd", 0, true},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
got, err := ParseDuration(tt.input)
|
|
||||||
if (err != nil) != tt.wantErr {
|
|
||||||
t.Errorf("ParseDuration(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("ParseDuration(%q) = %v, want %v", tt.input, got, tt.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigFor(t *testing.T) {
|
|
||||||
c := &Config{
|
|
||||||
Default: "3d",
|
|
||||||
Ecosystems: map[string]string{
|
|
||||||
"npm": "7d",
|
|
||||||
"cargo": "0",
|
|
||||||
},
|
|
||||||
Packages: map[string]string{
|
|
||||||
"pkg:npm/lodash": "0",
|
|
||||||
"pkg:npm/@babel/core": "14d",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
ecosystem string
|
|
||||||
packagePURL string
|
|
||||||
want time.Duration
|
|
||||||
}{
|
|
||||||
// Package override takes priority
|
|
||||||
{"npm", "pkg:npm/lodash", 0},
|
|
||||||
{"npm", "pkg:npm/@babel/core", 14 * 24 * time.Hour},
|
|
||||||
// Ecosystem override
|
|
||||||
{"npm", "pkg:npm/express", 7 * 24 * time.Hour},
|
|
||||||
{"cargo", "pkg:cargo/serde", 0},
|
|
||||||
// Global default
|
|
||||||
{"pypi", "pkg:pypi/requests", 3 * 24 * time.Hour},
|
|
||||||
{"pub", "pkg:pub/flutter", 3 * 24 * time.Hour},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
got := c.For(tt.ecosystem, tt.packagePURL)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("For(%q, %q) = %v, want %v", tt.ecosystem, tt.packagePURL, got, tt.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigIsAllowed(t *testing.T) {
|
|
||||||
c := &Config{
|
|
||||||
Default: "3d",
|
|
||||||
Packages: map[string]string{
|
|
||||||
"pkg:npm/lodash": "0",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
ecosystem string
|
|
||||||
packagePURL string
|
|
||||||
publishedAt time.Time
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{"old enough", "npm", "pkg:npm/express", now.Add(-4 * 24 * time.Hour), true},
|
|
||||||
{"too recent", "npm", "pkg:npm/express", now.Add(-1 * 24 * time.Hour), false},
|
|
||||||
{"exactly at boundary", "npm", "pkg:npm/express", now.Add(-3 * 24 * time.Hour), true},
|
|
||||||
{"exempt package", "npm", "pkg:npm/lodash", now.Add(-1 * time.Minute), true},
|
|
||||||
{"zero time", "npm", "pkg:npm/express", time.Time{}, true},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := c.IsAllowed(tt.ecosystem, tt.packagePURL, tt.publishedAt)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("IsAllowed(%q, %q, %v) = %v, want %v",
|
|
||||||
tt.ecosystem, tt.packagePURL, tt.publishedAt, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigEnabled(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
cfg Config
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{"empty config", Config{}, false},
|
|
||||||
{"default only", Config{Default: "3d"}, true},
|
|
||||||
{"ecosystem only", Config{Ecosystems: map[string]string{"npm": "7d"}}, true},
|
|
||||||
{"package only", Config{Packages: map[string]string{"pkg:npm/x": "1d"}}, true},
|
|
||||||
{"all zero", Config{Default: "0", Ecosystems: map[string]string{"npm": "0"}}, false},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := tt.cfg.Enabled()
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("Enabled() = %v, want %v", got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -6,7 +6,11 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
const postgresTimestamp = "TIMESTAMP"
|
const (
|
||||||
|
postgresTimestamp = "TIMESTAMP"
|
||||||
|
sqliteDatetime = "DATETIME"
|
||||||
|
colTypeText = "TEXT"
|
||||||
|
)
|
||||||
|
|
||||||
// Schema for proxy-specific tables. The packages and versions tables
|
// Schema for proxy-specific tables. The packages and versions tables
|
||||||
// are compatible with git-pkgs, allowing the proxy to use an existing
|
// are compatible with git-pkgs, allowing the proxy to use an existing
|
||||||
|
|
@ -369,9 +373,9 @@ func isTableNotFound(err error) bool {
|
||||||
func (db *DB) createMigrationsTable() error {
|
func (db *DB) createMigrationsTable() error {
|
||||||
var ts string
|
var ts string
|
||||||
if db.dialect == DialectPostgres {
|
if db.dialect == DialectPostgres {
|
||||||
ts = "TIMESTAMP"
|
ts = postgresTimestamp
|
||||||
} else {
|
} else {
|
||||||
ts = "DATETIME"
|
ts = sqliteDatetime
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`CREATE TABLE IF NOT EXISTS migrations (
|
query := fmt.Sprintf(`CREATE TABLE IF NOT EXISTS migrations (
|
||||||
|
|
@ -457,12 +461,12 @@ func (db *DB) MigrateSchema() error {
|
||||||
|
|
||||||
func migrateAddPackagesEnrichmentColumns(db *DB) error {
|
func migrateAddPackagesEnrichmentColumns(db *DB) error {
|
||||||
columns := map[string]string{
|
columns := map[string]string{
|
||||||
"registry_url": "TEXT",
|
"registry_url": colTypeText,
|
||||||
"supplier_name": "TEXT",
|
"supplier_name": colTypeText,
|
||||||
"supplier_type": "TEXT",
|
"supplier_type": colTypeText,
|
||||||
"source": "TEXT",
|
"source": colTypeText,
|
||||||
"enriched_at": "DATETIME",
|
"enriched_at": sqliteDatetime,
|
||||||
"vulns_synced_at": "DATETIME",
|
"vulns_synced_at": sqliteDatetime,
|
||||||
}
|
}
|
||||||
|
|
||||||
if db.dialect == DialectPostgres {
|
if db.dialect == DialectPostgres {
|
||||||
|
|
@ -487,10 +491,10 @@ func migrateAddPackagesEnrichmentColumns(db *DB) error {
|
||||||
|
|
||||||
func migrateAddVersionsEnrichmentColumns(db *DB) error {
|
func migrateAddVersionsEnrichmentColumns(db *DB) error {
|
||||||
columns := map[string]string{
|
columns := map[string]string{
|
||||||
"integrity": "TEXT",
|
"integrity": colTypeText,
|
||||||
"yanked": "INTEGER DEFAULT 0",
|
"yanked": "INTEGER DEFAULT 0",
|
||||||
"source": "TEXT",
|
"source": colTypeText,
|
||||||
"enriched_at": "DATETIME",
|
"enriched_at": sqliteDatetime,
|
||||||
}
|
}
|
||||||
|
|
||||||
if db.dialect == DialectPostgres {
|
if db.dialect == DialectPostgres {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func cargoTestProxy() *Proxy {
|
func cargoTestProxy() *Proxy {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
@ -16,6 +17,7 @@ import (
|
||||||
const (
|
const (
|
||||||
composerUpstream = "https://packagist.org"
|
composerUpstream = "https://packagist.org"
|
||||||
composerRepo = "https://repo.packagist.org"
|
composerRepo = "https://repo.packagist.org"
|
||||||
|
composerUnset = "__unset"
|
||||||
vendorPackageParts = 2
|
vendorPackageParts = 2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -150,7 +152,8 @@ func (h *ComposerHandler) rewriteMetadata(body []byte) ([]byte, error) {
|
||||||
|
|
||||||
// expandMinifiedVersions expands the Composer v2 minified format where each
|
// expandMinifiedVersions expands the Composer v2 minified format where each
|
||||||
// version entry only contains fields that differ from the previous entry.
|
// version entry only contains fields that differ from the previous entry.
|
||||||
// The "~dev" sentinel string resets the inheritance chain.
|
// The "~dev" sentinel string resets the inheritance chain, and the "__unset"
|
||||||
|
// value removes a field from the inherited state.
|
||||||
func expandMinifiedVersions(versionList []any) []any {
|
func expandMinifiedVersions(versionList []any) []any {
|
||||||
expanded := make([]any, 0, len(versionList))
|
expanded := make([]any, 0, len(versionList))
|
||||||
inherited := map[string]any{}
|
inherited := map[string]any{}
|
||||||
|
|
@ -174,6 +177,10 @@ func expandMinifiedVersions(versionList []any) []any {
|
||||||
merged[k] = deepCopyValue(val)
|
merged[k] = deepCopyValue(val)
|
||||||
}
|
}
|
||||||
for k, val := range vmap {
|
for k, val := range vmap {
|
||||||
|
if val == composerUnset {
|
||||||
|
delete(merged, k)
|
||||||
|
continue
|
||||||
|
}
|
||||||
merged[k] = val
|
merged[k] = val
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -301,42 +308,44 @@ func (h *ComposerHandler) handleDownload(w http.ResponseWriter, r *http.Request)
|
||||||
h.proxy.Logger.Info("composer download request",
|
h.proxy.Logger.Info("composer download request",
|
||||||
"package", packageName, "version", version, "filename", filename)
|
"package", packageName, "version", version, "filename", filename)
|
||||||
|
|
||||||
// We need to fetch the metadata to get the actual download URL
|
// We need to fetch the metadata to get the actual download URL since
|
||||||
// since Packagist URLs include a hash
|
// Packagist URLs include a hash. Packagist serves dev versions (e.g.
|
||||||
metaURL := fmt.Sprintf("%s/p2/%s/%s.json", h.repoURL, vendor, pkg)
|
// "3.x-dev", "dev-master") from a separate "~dev" metadata file, while
|
||||||
|
// tagged releases live in the regular file. Try the file most likely to
|
||||||
|
// contain this version first, then fall back to the other so that both
|
||||||
|
// stable and dev versions resolve correctly.
|
||||||
|
metaURLs := h.metadataURLsForVersion(vendor, pkg, version)
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, metaURL, nil)
|
h.proxy.Logger.Debug("resolving download URL",
|
||||||
if err != nil {
|
"package", packageName, "version", version,
|
||||||
http.Error(w, "failed to create request", http.StatusInternalServerError)
|
"metadata_urls", metaURLs)
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, err := h.proxy.HTTPClient.Do(req)
|
var downloadURL string
|
||||||
|
for _, metaURL := range metaURLs {
|
||||||
|
url, err := h.findDownloadURLFromMetadata(r.Context(), metaURL, packageName, version)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h.proxy.Logger.Error("failed to fetch metadata", "error", err)
|
h.proxy.Logger.Error("failed to fetch metadata", "error", err, "url", metaURL)
|
||||||
http.Error(w, "failed to fetch metadata", http.StatusBadGateway)
|
http.Error(w, "failed to fetch metadata", http.StatusBadGateway)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = resp.Body.Close() }()
|
if url != "" {
|
||||||
|
downloadURL = url
|
||||||
if resp.StatusCode != http.StatusOK {
|
break
|
||||||
http.Error(w, "package not found", http.StatusNotFound)
|
}
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var metadata map[string]any
|
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {
|
|
||||||
http.Error(w, "failed to parse metadata", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find the download URL for this version
|
|
||||||
downloadURL := h.findDownloadURL(metadata, packageName, version)
|
|
||||||
if downloadURL == "" {
|
if downloadURL == "" {
|
||||||
|
h.proxy.Logger.Debug("version not found in any metadata source",
|
||||||
|
"package", packageName, "version", version,
|
||||||
|
"tried_urls", metaURLs)
|
||||||
http.Error(w, "version not found", http.StatusNotFound)
|
http.Error(w, "version not found", http.StatusNotFound)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h.proxy.Logger.Debug("resolved download URL",
|
||||||
|
"package", packageName, "version", version,
|
||||||
|
"download_url", downloadURL)
|
||||||
|
|
||||||
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "composer", packageName, version, filename, downloadURL)
|
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "composer", packageName, version, filename, downloadURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h.proxy.Logger.Error("failed to get artifact", "error", err)
|
h.proxy.Logger.Error("failed to get artifact", "error", err)
|
||||||
|
|
@ -347,6 +356,82 @@ func (h *ComposerHandler) handleDownload(w http.ResponseWriter, r *http.Request)
|
||||||
ServeArtifact(w, result)
|
ServeArtifact(w, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isDevVersion reports whether a Composer version string refers to a
|
||||||
|
// development (unstable, branch) version rather than a tagged release.
|
||||||
|
// Composer formats these as either "dev-<branch>" (e.g. "dev-master") or
|
||||||
|
// "<alias>-dev" (e.g. "3.x-dev").
|
||||||
|
func isDevVersion(version string) bool {
|
||||||
|
return strings.HasPrefix(version, "dev-") || strings.HasSuffix(version, "-dev")
|
||||||
|
}
|
||||||
|
|
||||||
|
// metadataURLsForVersion returns the upstream metadata URLs to consult for a
|
||||||
|
// given version, in priority order. Dev versions are served from the "~dev"
|
||||||
|
// file, tagged releases from the regular file; the other file is included as a
|
||||||
|
// fallback so an unexpected classification still resolves.
|
||||||
|
func (h *ComposerHandler) metadataURLsForVersion(vendor, pkg, version string) []string {
|
||||||
|
stable := fmt.Sprintf("%s/p2/%s/%s.json", h.repoURL, vendor, pkg)
|
||||||
|
dev := fmt.Sprintf("%s/p2/%s/%s~dev.json", h.repoURL, vendor, pkg)
|
||||||
|
|
||||||
|
if isDevVersion(version) {
|
||||||
|
return []string{dev, stable}
|
||||||
|
}
|
||||||
|
return []string{stable, dev}
|
||||||
|
}
|
||||||
|
|
||||||
|
// findDownloadURLFromMetadata fetches a metadata document and returns the dist
|
||||||
|
// URL for the given version, or an empty string if the version is not present.
|
||||||
|
// An error is returned only on transport failure; a missing document (non-200)
|
||||||
|
// or a missing version both yield an empty string so the caller can fall back.
|
||||||
|
func (h *ComposerHandler) findDownloadURLFromMetadata(ctx context.Context, metaURL, packageName, version string) (string, error) {
|
||||||
|
h.proxy.Logger.Debug("fetching upstream metadata for download lookup",
|
||||||
|
"url", metaURL, "package", packageName, "version", version)
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, metaURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
h.proxy.Logger.Debug("upstream metadata response",
|
||||||
|
"url", metaURL, "status", resp.StatusCode)
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var metadata map[string]any
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expand minified Composer v2 format so that inherited fields (including
|
||||||
|
// dist) are present on every version entry. Without this, versions that
|
||||||
|
// inherit dist from a previous entry will appear to have no download URL.
|
||||||
|
if metadata["minified"] == "composer/2.0" {
|
||||||
|
h.proxy.Logger.Debug("expanding minified metadata", "url", metaURL)
|
||||||
|
if packages, ok := metadata["packages"].(map[string]any); ok {
|
||||||
|
for pkgName, versions := range packages {
|
||||||
|
versionList, ok := versions.([]any)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
packages[pkgName] = expandMinifiedVersions(versionList)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
url := h.findDownloadURL(metadata, packageName, version)
|
||||||
|
h.proxy.Logger.Debug("download URL lookup result",
|
||||||
|
"url", metaURL, "package", packageName, "version", version,
|
||||||
|
"download_url", url)
|
||||||
|
return url, nil
|
||||||
|
}
|
||||||
|
|
||||||
// findDownloadURL finds the dist URL for a specific version in metadata.
|
// findDownloadURL finds the dist URL for a specific version in metadata.
|
||||||
func (h *ComposerHandler) findDownloadURL(metadata map[string]any, packageName, version string) string {
|
func (h *ComposerHandler) findDownloadURL(metadata map[string]any, packageName, version string) string {
|
||||||
packages, ok := metadata["packages"].(map[string]any)
|
packages, ok := metadata["packages"].(map[string]any)
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,16 @@
|
||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestComposerRewriteMetadata(t *testing.T) {
|
func TestComposerRewriteMetadata(t *testing.T) {
|
||||||
|
|
@ -177,6 +180,80 @@ func TestComposerRewriteMetadataMinifiedDevReset(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestComposerRewriteMetadataUnset(t *testing.T) {
|
||||||
|
h := &ComposerHandler{
|
||||||
|
proxy: &Proxy{Logger: slog.Default()},
|
||||||
|
proxyURL: "http://localhost:8080",
|
||||||
|
}
|
||||||
|
|
||||||
|
// In the minified format, "__unset" removes a field from the inherited
|
||||||
|
// state. v1.29.0 has require-dev, v1.28.0 unsets it, v1.27.0 inherits the
|
||||||
|
// unset state. Composer rejects metadata where require-dev (or any link
|
||||||
|
// field) is the literal string "__unset" rather than an object.
|
||||||
|
input := `{
|
||||||
|
"minified": "composer/2.0",
|
||||||
|
"packages": {
|
||||||
|
"venturecraft/revisionable": [
|
||||||
|
{
|
||||||
|
"name": "venturecraft/revisionable",
|
||||||
|
"version": "1.29.0",
|
||||||
|
"require": {"php": ">=5.4"},
|
||||||
|
"require-dev": {"orchestra/testbench": "~3.0"},
|
||||||
|
"dist": {"url": "https://example.com/a.zip", "type": "zip"}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.28.0",
|
||||||
|
"require-dev": "__unset"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.27.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.26.0",
|
||||||
|
"require-dev": {"foo/bar": "1.0"}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}`
|
||||||
|
|
||||||
|
output, err := h.rewriteMetadata([]byte(input))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rewriteMetadata failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var result map[string]any
|
||||||
|
if err := json.Unmarshal(output, &result); err != nil {
|
||||||
|
t.Fatalf("failed to parse output: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
versions := result["packages"].(map[string]any)["venturecraft/revisionable"].([]any)
|
||||||
|
if len(versions) != 4 {
|
||||||
|
t.Fatalf("expected 4 versions, got %d", len(versions))
|
||||||
|
}
|
||||||
|
|
||||||
|
byVersion := map[string]map[string]any{}
|
||||||
|
for _, v := range versions {
|
||||||
|
vmap := v.(map[string]any)
|
||||||
|
byVersion[vmap["version"].(string)] = vmap
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := byVersion["1.29.0"]["require-dev"].(map[string]any); !ok {
|
||||||
|
t.Errorf("1.29.0 require-dev should be an object, got %T", byVersion["1.29.0"]["require-dev"])
|
||||||
|
}
|
||||||
|
if rd, ok := byVersion["1.28.0"]["require-dev"]; ok {
|
||||||
|
t.Errorf("1.28.0 require-dev should be absent, got %v", rd)
|
||||||
|
}
|
||||||
|
if rd, ok := byVersion["1.27.0"]["require-dev"]; ok {
|
||||||
|
t.Errorf("1.27.0 require-dev should be absent (inherited unset), got %v", rd)
|
||||||
|
}
|
||||||
|
if _, ok := byVersion["1.26.0"]["require-dev"].(map[string]any); !ok {
|
||||||
|
t.Errorf("1.26.0 require-dev should be an object, got %T", byVersion["1.26.0"]["require-dev"])
|
||||||
|
}
|
||||||
|
if _, ok := byVersion["1.27.0"]["require"].(map[string]any); !ok {
|
||||||
|
t.Error("1.27.0 should still inherit require from 1.29.0")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestComposerRewriteMetadataCooldownPreservesNames(t *testing.T) {
|
func TestComposerRewriteMetadataCooldownPreservesNames(t *testing.T) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
old := now.Add(-10 * 24 * time.Hour).Format(time.RFC3339)
|
old := now.Add(-10 * 24 * time.Hour).Format(time.RFC3339)
|
||||||
|
|
@ -391,6 +468,100 @@ func TestComposerExpandMinifiedSharedDistReferences(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestComposerDownloadDevVersionUsesDevMetadata is a regression test for the
|
||||||
|
// bug that made it impossible to install a *-dev dependency from dist.
|
||||||
|
//
|
||||||
|
// Packagist serves development versions (e.g. "3.x-dev", "dev-master") from a
|
||||||
|
// separate "{package}~dev.json" metadata file; the regular "{package}.json"
|
||||||
|
// file contains only tagged releases. The download handler used to fetch only
|
||||||
|
// the regular file, so it could never find the dist URL for a dev version and
|
||||||
|
// returned 404 — causing Composer to silently fall back to a git clone.
|
||||||
|
//
|
||||||
|
// This test serves both files from a mock upstream and asserts that:
|
||||||
|
// - the OLD behavior (regular file only) cannot resolve the dev version, and
|
||||||
|
// - the FIXED behavior (consulting the ~dev file) does.
|
||||||
|
func TestComposerDownloadDevVersionUsesDevMetadata(t *testing.T) {
|
||||||
|
const (
|
||||||
|
pkg = "phpmd/phpmd"
|
||||||
|
vendor = "phpmd"
|
||||||
|
name = "phpmd"
|
||||||
|
version = "3.x-dev"
|
||||||
|
distURL = "https://api.github.com/repos/phpmd/phpmd/zipball/2a9217f60aaf27bf6ddad9188f254d020ab70745"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Regular metadata: tagged releases only — no dev versions.
|
||||||
|
stableBody := `{
|
||||||
|
"packages": {
|
||||||
|
"phpmd/phpmd": [
|
||||||
|
{"version": "2.15.0", "dist": {"url": "https://example.com/2.15.0.zip", "type": "zip"}}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}`
|
||||||
|
|
||||||
|
// ~dev metadata: where the 3.x-dev version actually lives.
|
||||||
|
devBody := `{
|
||||||
|
"packages": {
|
||||||
|
"phpmd/phpmd": [
|
||||||
|
{"version": "3.x-dev", "dist": {"url": "` + distURL + `", "type": "zip"}}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}`
|
||||||
|
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch r.URL.Path {
|
||||||
|
case "/p2/phpmd/phpmd.json":
|
||||||
|
_, _ = w.Write([]byte(stableBody))
|
||||||
|
case "/p2/phpmd/phpmd~dev.json":
|
||||||
|
_, _ = w.Write([]byte(devBody))
|
||||||
|
default:
|
||||||
|
http.NotFound(w, r)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
h := &ComposerHandler{
|
||||||
|
proxy: testProxy(),
|
||||||
|
repoURL: srv.URL,
|
||||||
|
proxyURL: "http://localhost:8080",
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// OLD behavior: fetching only the regular file fails to resolve the dev
|
||||||
|
// version, which is what produced the 404 before the fix.
|
||||||
|
stableURL := srv.URL + "/p2/phpmd/phpmd.json"
|
||||||
|
got, err := h.findDownloadURLFromMetadata(ctx, stableURL, pkg, version)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error fetching regular metadata: %v", err)
|
||||||
|
}
|
||||||
|
if got != "" {
|
||||||
|
t.Fatalf("regular metadata unexpectedly contained dev version %q (got %q); "+
|
||||||
|
"the test no longer reproduces the original bug", version, got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXED behavior: the handler consults the ~dev file (it is first in the
|
||||||
|
// candidate list for dev versions) and resolves the dist URL.
|
||||||
|
urls := h.metadataURLsForVersion(vendor, name, version)
|
||||||
|
if len(urls) == 0 || !strings.HasSuffix(urls[0], "/p2/phpmd/phpmd~dev.json") {
|
||||||
|
t.Fatalf("dev version should consult the ~dev metadata file first, got %v", urls)
|
||||||
|
}
|
||||||
|
|
||||||
|
var resolved string
|
||||||
|
for _, u := range urls {
|
||||||
|
resolved, err = h.findDownloadURLFromMetadata(ctx, u, pkg, version)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error fetching metadata %q: %v", u, err)
|
||||||
|
}
|
||||||
|
if resolved != "" {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if resolved != distURL {
|
||||||
|
t.Errorf("dev version dist URL = %q, want %q", resolved, distURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestComposerRewriteMetadataCooldown(t *testing.T) {
|
func TestComposerRewriteMetadataCooldown(t *testing.T) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
old := now.Add(-10 * 24 * time.Hour).Format(time.RFC3339)
|
old := now.Add(-10 * 24 * time.Hour).Format(time.RFC3339)
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ func (h *CondaHandler) handleRepodata(w http.ResponseWriter, r *http.Request) {
|
||||||
http.Error(w, "failed to create request", http.StatusInternalServerError)
|
http.Error(w, "failed to create request", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
req.Header.Set("Accept-Encoding", "gzip")
|
req.Header.Set(headerAcceptEncoding, "gzip")
|
||||||
|
|
||||||
resp, err := h.proxy.HTTPClient.Do(req)
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -161,7 +161,7 @@ func (h *CondaHandler) handleRepodata(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
body, err := ReadMetadata(resp.Body)
|
body, err := h.proxy.ReadMetadata(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to read response", http.StatusInternalServerError)
|
http.Error(w, "failed to read response", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
|
|
@ -241,5 +241,5 @@ func (h *CondaHandler) proxyCached(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
// proxyUpstream forwards a request to Anaconda without caching.
|
// proxyUpstream forwards a request to Anaconda without caching.
|
||||||
func (h *CondaHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
func (h *CondaHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
||||||
h.proxy.ProxyUpstream(w, r, h.upstreamURL+r.URL.Path, []string{"Accept-Encoding"})
|
h.proxy.ProxyUpstream(w, r, h.upstreamURL+r.URL.Path, []string{headerAcceptEncoding})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCondaParseFilename(t *testing.T) {
|
func TestCondaParseFilename(t *testing.T) {
|
||||||
|
|
|
||||||
|
|
@ -159,5 +159,5 @@ func (h *CRANHandler) proxyCached(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
// proxyUpstream forwards a request to CRAN without caching.
|
// proxyUpstream forwards a request to CRAN without caching.
|
||||||
func (h *CRANHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
func (h *CRANHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
||||||
h.proxy.ProxyUpstream(w, r, h.upstreamURL+r.URL.Path, []string{"Accept-Encoding"})
|
h.proxy.ProxyUpstream(w, r, h.upstreamURL+r.URL.Path, []string{headerAcceptEncoding})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -673,7 +673,7 @@ func TestMavenHandler_DownloadCacheHit(t *testing.T) {
|
||||||
proxy, db, store, _ := setupTestProxy(t)
|
proxy, db, store, _ := setupTestProxy(t)
|
||||||
seedPackageWithPURL(t, db, store, "maven", "com.google.guava:guava", "32.1.3-jre", "guava-32.1.3-jre.jar", "jar content")
|
seedPackageWithPURL(t, db, store, "maven", "com.google.guava:guava", "32.1.3-jre", "guava-32.1.3-jre.jar", "jar content")
|
||||||
|
|
||||||
h := NewMavenHandler(proxy, "http://localhost")
|
h := NewMavenHandler(proxy, "http://localhost", "", "")
|
||||||
srv := httptest.NewServer(h.Routes())
|
srv := httptest.NewServer(h.Routes())
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
|
|
@ -730,7 +730,7 @@ func TestMavenHandler_MetadataProxied(t *testing.T) {
|
||||||
|
|
||||||
func TestMavenHandler_EmptyPathNotFound(t *testing.T) {
|
func TestMavenHandler_EmptyPathNotFound(t *testing.T) {
|
||||||
proxy, _, _, _ := setupTestProxy(t)
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
h := NewMavenHandler(proxy, "http://localhost")
|
h := NewMavenHandler(proxy, "http://localhost", "", "")
|
||||||
srv := httptest.NewServer(h.Routes())
|
srv := httptest.NewServer(h.Routes())
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
|
|
@ -748,7 +748,7 @@ func TestMavenHandler_EmptyPathNotFound(t *testing.T) {
|
||||||
func TestMavenHandler_ArtifactExtensions(t *testing.T) {
|
func TestMavenHandler_ArtifactExtensions(t *testing.T) {
|
||||||
proxy, _, _, fetcher := setupTestProxy(t)
|
proxy, _, _, fetcher := setupTestProxy(t)
|
||||||
|
|
||||||
extensions := []string{".jar", ".war", ".ear", ".pom", ".aar", ".klib"}
|
extensions := []string{".jar", ".war", ".ear", ".pom", ".aar", ".klib", ".module"}
|
||||||
for _, ext := range extensions {
|
for _, ext := range extensions {
|
||||||
fetcher.artifact = &fetch.Artifact{
|
fetcher.artifact = &fetch.Artifact{
|
||||||
Body: io.NopCloser(strings.NewReader("artifact")),
|
Body: io.NopCloser(strings.NewReader("artifact")),
|
||||||
|
|
@ -756,7 +756,7 @@ func TestMavenHandler_ArtifactExtensions(t *testing.T) {
|
||||||
}
|
}
|
||||||
fetcher.fetchCalled = false
|
fetcher.fetchCalled = false
|
||||||
|
|
||||||
h := NewMavenHandler(proxy, "http://localhost")
|
h := NewMavenHandler(proxy, "http://localhost", "", "")
|
||||||
|
|
||||||
upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
t.Errorf("should not proxy artifact file %s to upstream", ext)
|
t.Errorf("should not proxy artifact file %s to upstream", ext)
|
||||||
|
|
@ -789,7 +789,7 @@ func TestMavenHandler_CacheMiss(t *testing.T) {
|
||||||
ContentType: "application/java-archive",
|
ContentType: "application/java-archive",
|
||||||
}
|
}
|
||||||
|
|
||||||
h := NewMavenHandler(proxy, "http://localhost")
|
h := NewMavenHandler(proxy, "http://localhost", "", "")
|
||||||
srv := httptest.NewServer(h.Routes())
|
srv := httptest.NewServer(h.Routes())
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
|
|
@ -809,6 +809,274 @@ func TestMavenHandler_CacheMiss(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestMavenHandler_GradlePluginMarkerFallbackAndCache(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
markerPath string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Spotless",
|
||||||
|
markerPath: "/com/diffplug/spotless/com.diffplug.spotless.gradle.plugin/8.4.0/com.diffplug.spotless.gradle.plugin-8.4.0.pom",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "BenManes",
|
||||||
|
markerPath: "/com/github/ben-manes/versions/com.github.ben-manes.versions.gradle.plugin/0.54.0/com.github.ben-manes.versions.gradle.plugin-0.54.0.pom",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
proxy, _, _, fetcher := setupTestProxy(t)
|
||||||
|
|
||||||
|
primaryUpstream := "https://repo1.maven.org/maven2"
|
||||||
|
pluginPortalUpstream := "https://plugins.gradle.org/m2"
|
||||||
|
primaryURL := primaryUpstream + tt.markerPath
|
||||||
|
|
||||||
|
fetcher.fetchErrByURL = map[string]error{
|
||||||
|
primaryURL: ErrUpstreamNotFound,
|
||||||
|
}
|
||||||
|
fetcher.artifact = &fetch.Artifact{
|
||||||
|
Body: io.NopCloser(strings.NewReader("<project/>")),
|
||||||
|
ContentType: "application/xml",
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewMavenHandler(proxy, "http://localhost", primaryUpstream, pluginPortalUpstream)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
resp, err := http.Get(srv.URL + tt.markerPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("request failed: %v", err)
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want %d", resp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if string(body) != "<project/>" {
|
||||||
|
t.Fatalf("body = %q, want %q", body, "<project/>")
|
||||||
|
}
|
||||||
|
|
||||||
|
wantFallbackURL := pluginPortalUpstream + tt.markerPath
|
||||||
|
if fetcher.fetchedURL != wantFallbackURL {
|
||||||
|
t.Fatalf("fallback URL = %q, want %q", fetcher.fetchedURL, wantFallbackURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
fetcher.fetchCalled = false
|
||||||
|
resp, err = http.Get(srv.URL + tt.markerPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("second request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("second status = %d, want %d", resp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if fetcher.fetchCalled {
|
||||||
|
t.Fatal("expected plugin marker POM to be served from cache on second request")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMavenHandler_GradlePluginMarkerMetadataFallback(t *testing.T) {
|
||||||
|
paths := map[string]string{
|
||||||
|
"/com/diffplug/spotless/com.diffplug.spotless.gradle.plugin/8.4.0/com.diffplug.spotless.gradle.plugin-8.4.0.pom.sha1": "sha1",
|
||||||
|
"/com/diffplug/spotless/com.diffplug.spotless.gradle.plugin/8.4.0/com.diffplug.spotless.gradle.plugin-8.4.0.pom.sha256": "sha256",
|
||||||
|
"/com/diffplug/spotless/com.diffplug.spotless.gradle.plugin/8.4.0/com.diffplug.spotless.gradle.plugin-8.4.0.pom.md5": "md5",
|
||||||
|
"/com/diffplug/spotless/com.diffplug.spotless.gradle.plugin/maven-metadata.xml": "<metadata/>",
|
||||||
|
}
|
||||||
|
|
||||||
|
primaryHits := map[string]int{}
|
||||||
|
pluginHits := map[string]int{}
|
||||||
|
|
||||||
|
primary := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
primaryHits[r.URL.Path]++
|
||||||
|
if _, ok := paths[r.URL.Path]; ok {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.Fatalf("unexpected path to primary upstream: %s", r.URL.Path)
|
||||||
|
}))
|
||||||
|
defer primary.Close()
|
||||||
|
|
||||||
|
pluginPortal := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
pluginHits[r.URL.Path]++
|
||||||
|
body, ok := paths[r.URL.Path]
|
||||||
|
if !ok {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = io.WriteString(w, body)
|
||||||
|
}))
|
||||||
|
defer pluginPortal.Close()
|
||||||
|
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
proxy.HTTPClient = primary.Client()
|
||||||
|
|
||||||
|
h := NewMavenHandler(proxy, "http://localhost", primary.URL, pluginPortal.URL)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
for reqPath, wantBody := range paths {
|
||||||
|
resp, err := http.Get(srv.URL + reqPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET %s failed: %v", reqPath, err)
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("GET %s: status = %d, want %d", reqPath, resp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if string(body) != wantBody {
|
||||||
|
t.Fatalf("GET %s: body = %q, want %q", reqPath, body, wantBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
if primaryHits[reqPath] == 0 {
|
||||||
|
t.Fatalf("GET %s did not hit primary upstream", reqPath)
|
||||||
|
}
|
||||||
|
if pluginHits[reqPath] == 0 {
|
||||||
|
t.Fatalf("GET %s did not hit plugin portal fallback", reqPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMavenHandler_GradlePluginImplementationMetadataFallback(t *testing.T) {
|
||||||
|
paths := map[string]string{
|
||||||
|
"/com/diffplug/spotless/spotless-plugin-gradle/8.4.0/spotless-plugin-gradle-8.4.0.jar.sha1": "impl-sha1",
|
||||||
|
"/com/diffplug/spotless/spotless-plugin-gradle/8.4.0/spotless-plugin-gradle-8.4.0.jar.sha256": "impl-sha256",
|
||||||
|
}
|
||||||
|
|
||||||
|
primaryHits := map[string]int{}
|
||||||
|
pluginHits := map[string]int{}
|
||||||
|
|
||||||
|
primary := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
primaryHits[r.URL.Path]++
|
||||||
|
if _, ok := paths[r.URL.Path]; ok {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.Fatalf("unexpected path to primary upstream: %s", r.URL.Path)
|
||||||
|
}))
|
||||||
|
defer primary.Close()
|
||||||
|
|
||||||
|
pluginPortal := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
pluginHits[r.URL.Path]++
|
||||||
|
body, ok := paths[r.URL.Path]
|
||||||
|
if !ok {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = io.WriteString(w, body)
|
||||||
|
}))
|
||||||
|
defer pluginPortal.Close()
|
||||||
|
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
proxy.HTTPClient = primary.Client()
|
||||||
|
|
||||||
|
h := NewMavenHandler(proxy, "http://localhost", primary.URL, pluginPortal.URL)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
for reqPath, wantBody := range paths {
|
||||||
|
resp, err := http.Get(srv.URL + reqPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET %s failed: %v", reqPath, err)
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("GET %s: status = %d, want %d", reqPath, resp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if string(body) != wantBody {
|
||||||
|
t.Fatalf("GET %s: body = %q, want %q", reqPath, body, wantBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
if primaryHits[reqPath] == 0 {
|
||||||
|
t.Fatalf("GET %s did not hit primary upstream", reqPath)
|
||||||
|
}
|
||||||
|
if pluginHits[reqPath] == 0 {
|
||||||
|
t.Fatalf("GET %s did not hit plugin portal fallback", reqPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMavenHandler_GradlePluginImplementation_FallbackToPluginPortal(t *testing.T) {
|
||||||
|
proxy, _, _, fetcher := setupTestProxy(t)
|
||||||
|
|
||||||
|
primaryUpstream := "https://repo1.maven.org/maven2"
|
||||||
|
pluginPortalUpstream := "https://plugins.gradle.org/m2"
|
||||||
|
implPath := "/com/diffplug/spotless/spotless-plugin-gradle/8.4.0/spotless-plugin-gradle-8.4.0.jar"
|
||||||
|
primaryURL := primaryUpstream + implPath
|
||||||
|
pluginPortalURL := pluginPortalUpstream + implPath
|
||||||
|
|
||||||
|
fetcher.fetchErrByURL = map[string]error{
|
||||||
|
primaryURL: ErrUpstreamNotFound,
|
||||||
|
}
|
||||||
|
fetcher.artifact = &fetch.Artifact{
|
||||||
|
Body: io.NopCloser(strings.NewReader("plugin impl jar")),
|
||||||
|
ContentType: "application/java-archive",
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewMavenHandler(proxy, "http://localhost", primaryUpstream, pluginPortalUpstream)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
resp, err := http.Get(srv.URL + implPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("request failed: %v", err)
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want %d", resp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if string(body) != "plugin impl jar" {
|
||||||
|
t.Fatalf("body = %q, want %q", body, "plugin impl jar")
|
||||||
|
}
|
||||||
|
|
||||||
|
if fetcher.fetchedURL != pluginPortalURL {
|
||||||
|
t.Fatalf("implementation artifact should fallback to plugin portal; fetched URL = %q, want %q", fetcher.fetchedURL, pluginPortalURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMavenHandler_GradlePluginImplementation_NotFoundInBothUpstreams(t *testing.T) {
|
||||||
|
proxy, _, _, fetcher := setupTestProxy(t)
|
||||||
|
|
||||||
|
primaryUpstream := "https://repo1.maven.org/maven2"
|
||||||
|
pluginPortalUpstream := "https://plugins.gradle.org/m2"
|
||||||
|
implPath := "/com/diffplug/spotless/spotless-plugin-gradle/8.4.0/spotless-plugin-gradle-8.4.0.jar"
|
||||||
|
primaryURL := primaryUpstream + implPath
|
||||||
|
pluginPortalURL := pluginPortalUpstream + implPath
|
||||||
|
|
||||||
|
fetcher.fetchErrByURL = map[string]error{
|
||||||
|
primaryURL: ErrUpstreamNotFound,
|
||||||
|
pluginPortalURL: ErrUpstreamNotFound,
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewMavenHandler(proxy, "http://localhost", primaryUpstream, pluginPortalUpstream)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
resp, err := http.Get(srv.URL + implPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusNotFound {
|
||||||
|
t.Fatalf("status = %d, want %d", resp.StatusCode, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
if fetcher.fetchedURL != pluginPortalURL {
|
||||||
|
t.Fatalf("expected fallback attempt to plugin portal; fetched URL = %q, want %q", fetcher.fetchedURL, pluginPortalURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestNuGetHandler_DownloadCacheMiss(t *testing.T) {
|
func TestNuGetHandler_DownloadCacheMiss(t *testing.T) {
|
||||||
proxy, _, _, fetcher := setupTestProxy(t)
|
proxy, _, _, fetcher := setupTestProxy(t)
|
||||||
fetcher.artifact = &fetch.Artifact{
|
fetcher.artifact = &fetch.Artifact{
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ func (h *GemHandler) fetchCompactIndex(r *http.Request, name string) (*http.Resp
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
for _, hdr := range []string{"Accept", "Accept-Encoding", "If-None-Match", "If-Modified-Since"} {
|
for _, hdr := range []string{"Accept", headerAcceptEncoding, "If-None-Match", "If-Modified-Since"} {
|
||||||
if v := r.Header.Get(hdr); v != "" {
|
if v := r.Header.Get(hdr); v != "" {
|
||||||
req.Header.Set(hdr, v)
|
req.Header.Set(hdr, v)
|
||||||
}
|
}
|
||||||
|
|
@ -311,7 +311,7 @@ func (h *GemHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy relevant headers
|
// Copy relevant headers
|
||||||
for _, h := range []string{"Accept", "Accept-Encoding", "If-None-Match", "If-Modified-Since"} {
|
for _, h := range []string{"Accept", headerAcceptEncoding, "If-None-Match", "If-Modified-Since"} {
|
||||||
if v := r.Header.Get(h); v != "" {
|
if v := r.Header.Get(h); v != "" {
|
||||||
req.Header.Set(h, v)
|
req.Header.Set(h, v)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGemParseFilename(t *testing.T) {
|
func TestGemParseFilename(t *testing.T) {
|
||||||
|
|
|
||||||
178
internal/handler/gradle.go
Normal file
178
internal/handler/gradle.go
Normal file
|
|
@ -0,0 +1,178 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/metrics"
|
||||||
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
gradleBuildCacheContentType = "application/vnd.gradle.build-cache-artifact.v2"
|
||||||
|
gradleBuildCacheStorageRoot = "_gradle/http-build-cache"
|
||||||
|
defaultGradleMaxUploadSize = 100 << 20
|
||||||
|
)
|
||||||
|
|
||||||
|
var gradleBuildCacheKeyPattern = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9._-]*$`)
|
||||||
|
|
||||||
|
// GradleBuildCacheHandler handles Gradle HttpBuildCache GET/HEAD/PUT requests.
|
||||||
|
//
|
||||||
|
// This handler accepts /{key} when mounted under a base URL.
|
||||||
|
type GradleBuildCacheHandler struct {
|
||||||
|
proxy *Proxy
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewGradleBuildCacheHandler creates a Gradle HttpBuildCache handler.
|
||||||
|
func NewGradleBuildCacheHandler(proxy *Proxy) *GradleBuildCacheHandler {
|
||||||
|
return &GradleBuildCacheHandler{proxy: proxy}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Routes returns the HTTP handler for Gradle HttpBuildCache requests.
|
||||||
|
func (h *GradleBuildCacheHandler) Routes() http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch r.Method {
|
||||||
|
case http.MethodGet, http.MethodHead, http.MethodPut:
|
||||||
|
default:
|
||||||
|
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
key, statusCode := h.parseCacheKey(r.URL.Path)
|
||||||
|
if statusCode != http.StatusOK {
|
||||||
|
if statusCode == http.StatusNotFound {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
http.Error(w, "invalid cache key", statusCode)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method == http.MethodPut {
|
||||||
|
if h.proxy.GradleReadOnly {
|
||||||
|
http.Error(w, "gradle build cache is read-only", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
h.handlePut(w, r, key)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.handleGetOrHead(w, r, key)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *GradleBuildCacheHandler) parseCacheKey(urlPath string) (string, int) {
|
||||||
|
keyPath := strings.TrimPrefix(urlPath, "/")
|
||||||
|
if keyPath == "" {
|
||||||
|
return "", http.StatusNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
if containsPathTraversal(keyPath) {
|
||||||
|
return "", http.StatusBadRequest
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(keyPath, "/") {
|
||||||
|
return "", http.StatusNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
if !gradleBuildCacheKeyPattern.MatchString(keyPath) {
|
||||||
|
return "", http.StatusBadRequest
|
||||||
|
}
|
||||||
|
|
||||||
|
return keyPath, http.StatusOK
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *GradleBuildCacheHandler) cacheStoragePath(key string) string {
|
||||||
|
return gradleBuildCacheStorageRoot + "/" + key
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *GradleBuildCacheHandler) handleGetOrHead(w http.ResponseWriter, r *http.Request, key string) {
|
||||||
|
storagePath := h.cacheStoragePath(key)
|
||||||
|
w.Header().Set("Content-Type", gradleBuildCacheContentType)
|
||||||
|
|
||||||
|
if r.Method == http.MethodHead {
|
||||||
|
existsStart := time.Now()
|
||||||
|
exists, err := h.proxy.Storage.Exists(r.Context(), storagePath)
|
||||||
|
metrics.RecordStorageOperation("read", time.Since(existsStart))
|
||||||
|
if err != nil {
|
||||||
|
metrics.RecordStorageError("read")
|
||||||
|
h.proxy.Logger.Error("failed to check gradle build cache entry", "key", key, "error", err)
|
||||||
|
http.Error(w, "failed to read cache entry", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !exists {
|
||||||
|
metrics.RecordCacheMiss("gradle")
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
metrics.RecordCacheHit("gradle")
|
||||||
|
|
||||||
|
sizeStart := time.Now()
|
||||||
|
size, err := h.proxy.Storage.Size(r.Context(), storagePath)
|
||||||
|
metrics.RecordStorageOperation("read", time.Since(sizeStart))
|
||||||
|
if err != nil {
|
||||||
|
metrics.RecordStorageError("read")
|
||||||
|
} else if size >= 0 {
|
||||||
|
w.Header().Set("Content-Length", strconv.FormatInt(size, 10))
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
readStart := time.Now()
|
||||||
|
reader, err := h.proxy.Storage.Open(r.Context(), storagePath)
|
||||||
|
metrics.RecordStorageOperation("read", time.Since(readStart))
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, storage.ErrNotFound) {
|
||||||
|
metrics.RecordCacheMiss("gradle")
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
metrics.RecordStorageError("read")
|
||||||
|
h.proxy.Logger.Error("failed to open gradle build cache entry", "key", key, "error", err)
|
||||||
|
http.Error(w, "failed to read cache entry", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer func() { _ = reader.Close() }()
|
||||||
|
metrics.RecordCacheHit("gradle")
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_, _ = io.Copy(w, reader)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *GradleBuildCacheHandler) handlePut(w http.ResponseWriter, r *http.Request, key string) {
|
||||||
|
storagePath := h.cacheStoragePath(key)
|
||||||
|
maxUploadSize := h.proxy.GradleMaxUploadSize
|
||||||
|
if maxUploadSize <= 0 {
|
||||||
|
maxUploadSize = defaultGradleMaxUploadSize
|
||||||
|
}
|
||||||
|
|
||||||
|
r.Body = http.MaxBytesReader(w, r.Body, maxUploadSize)
|
||||||
|
|
||||||
|
storeStart := time.Now()
|
||||||
|
_, hash, err := h.proxy.Storage.Store(r.Context(), storagePath, r.Body)
|
||||||
|
metrics.RecordStorageOperation("write", time.Since(storeStart))
|
||||||
|
if err != nil {
|
||||||
|
var maxBytesErr *http.MaxBytesError
|
||||||
|
if errors.As(err, &maxBytesErr) {
|
||||||
|
http.Error(w, "cache entry too large", http.StatusRequestEntityTooLarge)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
metrics.RecordStorageError("write")
|
||||||
|
h.proxy.Logger.Error("failed to store gradle build cache entry", "key", key, "error", err)
|
||||||
|
http.Error(w, "failed to write cache entry", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Length", "0")
|
||||||
|
w.Header().Set("ETag", `"`+hash+`"`)
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
}
|
||||||
285
internal/handler/gradle_test.go
Normal file
285
internal/handler/gradle_test.go
Normal file
|
|
@ -0,0 +1,285 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/metrics"
|
||||||
|
"github.com/prometheus/client_golang/prometheus/testutil"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_PutGetHead(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
key := "a1b2c3d4e5f6"
|
||||||
|
payload := "cache entry content"
|
||||||
|
|
||||||
|
putReq, err := http.NewRequest(http.MethodPut, srv.URL+"/"+key, strings.NewReader(payload))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
putResp, err := http.DefaultClient.Do(putReq)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = putResp.Body.Close()
|
||||||
|
|
||||||
|
if putResp.StatusCode != http.StatusCreated {
|
||||||
|
t.Fatalf("PUT status = %d, want %d", putResp.StatusCode, http.StatusCreated)
|
||||||
|
}
|
||||||
|
|
||||||
|
getResp, err := http.Get(srv.URL + "/" + key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = getResp.Body.Close() }()
|
||||||
|
|
||||||
|
if getResp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("GET status = %d, want %d", getResp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
if getResp.Header.Get("Content-Type") != gradleBuildCacheContentType {
|
||||||
|
t.Fatalf("GET Content-Type = %q, want %q", getResp.Header.Get("Content-Type"), gradleBuildCacheContentType)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, _ := io.ReadAll(getResp.Body)
|
||||||
|
if string(body) != payload {
|
||||||
|
t.Fatalf("GET body = %q, want %q", body, payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
headReq, err := http.NewRequest(http.MethodHead, srv.URL+"/"+key, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create HEAD request: %v", err)
|
||||||
|
}
|
||||||
|
headResp, err := http.DefaultClient.Do(headReq)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("HEAD request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = headResp.Body.Close() }()
|
||||||
|
|
||||||
|
if headResp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("HEAD status = %d, want %d", headResp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
body, _ = io.ReadAll(headResp.Body)
|
||||||
|
if len(body) != 0 {
|
||||||
|
t.Fatalf("HEAD body length = %d, want 0", len(body))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_RootKeyPath(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
key := "rootpathkey"
|
||||||
|
putReq, err := http.NewRequest(http.MethodPut, srv.URL+"/"+key, strings.NewReader("root"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
putResp, err := http.DefaultClient.Do(putReq)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = putResp.Body.Close()
|
||||||
|
|
||||||
|
if putResp.StatusCode != http.StatusCreated {
|
||||||
|
t.Fatalf("PUT status = %d, want %d", putResp.StatusCode, http.StatusCreated)
|
||||||
|
}
|
||||||
|
|
||||||
|
getResp, err := http.Get(srv.URL + "/" + key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = getResp.Body.Close() }()
|
||||||
|
|
||||||
|
if getResp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("GET status = %d, want %d", getResp.StatusCode, http.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_GetMiss(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
resp, err := http.Get(srv.URL + "/missing-key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusNotFound {
|
||||||
|
t.Fatalf("status = %d, want %d", resp.StatusCode, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_MethodNotAllowed(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/key", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
h.Routes().ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusMethodNotAllowed {
|
||||||
|
t.Fatalf("status = %d, want %d", w.Code, http.StatusMethodNotAllowed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_PathTraversalRejected(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/../secret", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
h.Routes().ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Fatalf("status = %d, want %d", w.Code, http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_CachePrefixRejected(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/cache/key", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
h.Routes().ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusNotFound {
|
||||||
|
t.Fatalf("status = %d, want %d", w.Code, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_PutOverwriteReturnsCreated(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
key := "overwrite-key"
|
||||||
|
|
||||||
|
for i, payload := range []string{"first", "second"} {
|
||||||
|
req, err := http.NewRequest(http.MethodPut, srv.URL+"/"+key, strings.NewReader(payload))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = resp.Body.Close()
|
||||||
|
|
||||||
|
want := http.StatusCreated
|
||||||
|
if resp.StatusCode != want {
|
||||||
|
t.Fatalf("PUT #%d status = %d, want %d", i+1, resp.StatusCode, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_PutReadOnly(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
proxy.GradleReadOnly = true
|
||||||
|
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
req, err := http.NewRequest(http.MethodPut, srv.URL+"/readonly-key", strings.NewReader("payload"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusMethodNotAllowed {
|
||||||
|
t.Fatalf("PUT status = %d, want %d", resp.StatusCode, http.StatusMethodNotAllowed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_PutTooLarge(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
proxy.GradleMaxUploadSize = 4
|
||||||
|
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
req, err := http.NewRequest(http.MethodPut, srv.URL+"/oversized-key", strings.NewReader("12345"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusRequestEntityTooLarge {
|
||||||
|
t.Fatalf("PUT status = %d, want %d", resp.StatusCode, http.StatusRequestEntityTooLarge)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCacheHandler_RecordsMetrics(t *testing.T) {
|
||||||
|
proxy, _, _, _ := setupTestProxy(t)
|
||||||
|
h := NewGradleBuildCacheHandler(proxy)
|
||||||
|
srv := httptest.NewServer(h.Routes())
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
hitsBefore := testutil.ToFloat64(metrics.CacheHits.WithLabelValues("gradle"))
|
||||||
|
missesBefore := testutil.ToFloat64(metrics.CacheMisses.WithLabelValues("gradle"))
|
||||||
|
|
||||||
|
key := "metrics-key"
|
||||||
|
putReq, err := http.NewRequest(http.MethodPut, srv.URL+"/"+key, strings.NewReader("payload"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create PUT request: %v", err)
|
||||||
|
}
|
||||||
|
putResp, err := http.DefaultClient.Do(putReq)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PUT request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = putResp.Body.Close()
|
||||||
|
|
||||||
|
getResp, err := http.Get(srv.URL + "/" + key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = getResp.Body.Close()
|
||||||
|
|
||||||
|
headReq, err := http.NewRequest(http.MethodHead, srv.URL+"/"+key, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create HEAD request: %v", err)
|
||||||
|
}
|
||||||
|
headResp, err := http.DefaultClient.Do(headReq)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("HEAD request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = headResp.Body.Close()
|
||||||
|
|
||||||
|
missResp, err := http.Get(srv.URL + "/missing-key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GET miss request failed: %v", err)
|
||||||
|
}
|
||||||
|
_ = missResp.Body.Close()
|
||||||
|
|
||||||
|
hitsAfter := testutil.ToFloat64(metrics.CacheHits.WithLabelValues("gradle"))
|
||||||
|
missesAfter := testutil.ToFloat64(metrics.CacheMisses.WithLabelValues("gradle"))
|
||||||
|
|
||||||
|
if diff := hitsAfter - hitsBefore; diff != 2 {
|
||||||
|
t.Fatalf("cache hits delta = %.0f, want 2", diff)
|
||||||
|
}
|
||||||
|
if diff := missesAfter - missesBefore; diff != 1 {
|
||||||
|
t.Fatalf("cache misses delta = %.0f, want 1", diff)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -10,11 +10,12 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
"github.com/git-pkgs/proxy/internal/database"
|
"github.com/git-pkgs/proxy/internal/database"
|
||||||
"github.com/git-pkgs/proxy/internal/metrics"
|
"github.com/git-pkgs/proxy/internal/metrics"
|
||||||
"github.com/git-pkgs/proxy/internal/storage"
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
|
@ -23,9 +24,21 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// containsPathTraversal returns true if the path contains ".." segments
|
// containsPathTraversal returns true if the path contains ".." segments
|
||||||
// that could be used to escape the intended directory.
|
// that could be used to escape the intended directory. It checks the path
|
||||||
|
// as given and after URL-decoding, and treats backslashes as separators.
|
||||||
func containsPathTraversal(path string) bool {
|
func containsPathTraversal(path string) bool {
|
||||||
for _, segment := range strings.Split(path, "/") {
|
if hasDotDotSegment(path) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if decoded, err := url.PathUnescape(path); err == nil && decoded != path {
|
||||||
|
return hasDotDotSegment(decoded)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasDotDotSegment(path string) bool {
|
||||||
|
path = strings.ReplaceAll(path, "\\", "/")
|
||||||
|
for segment := range strings.SplitSeq(path, "/") {
|
||||||
if segment == ".." {
|
if segment == ".." {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
@ -37,23 +50,27 @@ const defaultHTTPTimeout = 30 * time.Second
|
||||||
|
|
||||||
const contentTypeJSON = "application/json"
|
const contentTypeJSON = "application/json"
|
||||||
|
|
||||||
// maxMetadataSize is the maximum size of upstream metadata responses (100 MB).
|
const headerAcceptEncoding = "Accept-Encoding"
|
||||||
// Package metadata (e.g. npm with many versions) can be large, but unbounded
|
|
||||||
// reads risk OOM if an upstream misbehaves.
|
|
||||||
const maxMetadataSize = 100 << 20
|
|
||||||
|
|
||||||
// ErrMetadataTooLarge is returned when upstream metadata exceeds maxMetadataSize.
|
// defaultMetadataMaxSize is used when Proxy.MetadataMaxSize is unset.
|
||||||
|
const defaultMetadataMaxSize = 100 << 20
|
||||||
|
|
||||||
|
// ErrMetadataTooLarge is returned when upstream metadata exceeds the configured limit.
|
||||||
var ErrMetadataTooLarge = errors.New("metadata response exceeds size limit")
|
var ErrMetadataTooLarge = errors.New("metadata response exceeds size limit")
|
||||||
|
|
||||||
// ReadMetadata reads an upstream response body with a size limit to prevent OOM
|
// ReadMetadata reads an upstream response body with a size limit to prevent OOM
|
||||||
// from unexpectedly large responses. Returns ErrMetadataTooLarge if the response
|
// from unexpectedly large responses. Returns ErrMetadataTooLarge if the response
|
||||||
// is truncated by the limit.
|
// is truncated by the limit.
|
||||||
func ReadMetadata(r io.Reader) ([]byte, error) {
|
func (p *Proxy) ReadMetadata(r io.Reader) ([]byte, error) {
|
||||||
data, err := io.ReadAll(io.LimitReader(r, maxMetadataSize+1))
|
limit := p.MetadataMaxSize
|
||||||
|
if limit <= 0 {
|
||||||
|
limit = defaultMetadataMaxSize
|
||||||
|
}
|
||||||
|
data, err := io.ReadAll(io.LimitReader(r, limit+1))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if int64(len(data)) > maxMetadataSize {
|
if int64(len(data)) > limit {
|
||||||
return nil, ErrMetadataTooLarge
|
return nil, ErrMetadataTooLarge
|
||||||
}
|
}
|
||||||
return data, nil
|
return data, nil
|
||||||
|
|
@ -69,6 +86,15 @@ type Proxy struct {
|
||||||
Cooldown *cooldown.Config
|
Cooldown *cooldown.Config
|
||||||
CacheMetadata bool
|
CacheMetadata bool
|
||||||
MetadataTTL time.Duration
|
MetadataTTL time.Duration
|
||||||
|
MetadataMaxSize int64
|
||||||
|
GradleReadOnly bool
|
||||||
|
GradleMaxUploadSize int64
|
||||||
|
DirectServe bool
|
||||||
|
DirectServeTTL time.Duration
|
||||||
|
// DirectServeBaseURL, if set, replaces the scheme and host of presigned
|
||||||
|
// URLs so clients receive a public address even when the proxy reaches
|
||||||
|
// storage at an internal one.
|
||||||
|
DirectServeBaseURL string
|
||||||
HTTPClient *http.Client
|
HTTPClient *http.Client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -92,6 +118,7 @@ func NewProxy(db *database.DB, store storage.Storage, fetcher fetch.FetcherInter
|
||||||
// CacheResult contains information about a cached or fetched artifact.
|
// CacheResult contains information about a cached or fetched artifact.
|
||||||
type CacheResult struct {
|
type CacheResult struct {
|
||||||
Reader io.ReadCloser
|
Reader io.ReadCloser
|
||||||
|
RedirectURL string
|
||||||
Size int64
|
Size int64
|
||||||
ContentType string
|
ContentType string
|
||||||
Hash string
|
Hash string
|
||||||
|
|
@ -138,6 +165,26 @@ func (p *Proxy) checkCache(ctx context.Context, pkgPURL, versionPURL, filename s
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
result := &CacheResult{
|
||||||
|
Size: artifact.Size.Int64,
|
||||||
|
ContentType: artifact.ContentType.String,
|
||||||
|
Hash: artifact.ContentHash.String,
|
||||||
|
Cached: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.DirectServe {
|
||||||
|
signed, err := p.Storage.SignedURL(ctx, artifact.StoragePath.String, p.DirectServeTTL)
|
||||||
|
if err == nil {
|
||||||
|
result.RedirectURL = rewriteSignedURLHost(signed, p.DirectServeBaseURL)
|
||||||
|
p.recordCacheHit(pkgPURL, versionPURL, filename)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
if !errors.Is(err, storage.ErrSignedURLUnsupported) {
|
||||||
|
p.Logger.Warn("failed to sign storage URL, falling back to streaming",
|
||||||
|
"path", artifact.StoragePath.String, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
reader, err := p.Storage.Open(ctx, artifact.StoragePath.String)
|
reader, err := p.Storage.Open(ctx, artifact.StoragePath.String)
|
||||||
metrics.RecordStorageOperation("read", time.Since(start))
|
metrics.RecordStorageOperation("read", time.Since(start))
|
||||||
|
|
@ -148,20 +195,45 @@ func (p *Proxy) checkCache(ctx context.Context, pkgPURL, versionPURL, filename s
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = p.DB.RecordArtifactHit(versionPURL, filename)
|
result.Reader = newVerifyingReader(reader, artifact.ContentHash.String, ver.Integrity.String,
|
||||||
|
func(reason string) {
|
||||||
// Extract ecosystem from pkgPURL for metrics
|
p.Logger.Error("cached artifact failed integrity check",
|
||||||
if p, err := purl.Parse(pkgPURL); err == nil {
|
"purl", versionPURL, "filename", filename,
|
||||||
metrics.RecordCacheHit(purl.PURLTypeToEcosystem(p.Type))
|
"path", artifact.StoragePath.String, "reason", reason)
|
||||||
|
metrics.RecordIntegrityFailure(pkg.Ecosystem)
|
||||||
|
if err := p.DB.ClearArtifactCache(versionPURL, filename); err != nil {
|
||||||
|
p.Logger.Warn("failed to clear corrupt artifact from cache", "error", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
p.recordCacheHit(pkgPURL, versionPURL, filename)
|
||||||
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return &CacheResult{
|
// rewriteSignedURLHost replaces the scheme and host of a signed URL with those
|
||||||
Reader: reader,
|
// from baseURL, preserving the path and query (which carry the signature).
|
||||||
Size: artifact.Size.Int64,
|
// Returns signed unchanged if baseURL is empty or either URL fails to parse.
|
||||||
ContentType: artifact.ContentType.String,
|
func rewriteSignedURLHost(signed, baseURL string) string {
|
||||||
Hash: artifact.ContentHash.String,
|
if baseURL == "" {
|
||||||
Cached: true,
|
return signed
|
||||||
}, nil
|
}
|
||||||
|
s, err := url.Parse(signed)
|
||||||
|
if err != nil {
|
||||||
|
return signed
|
||||||
|
}
|
||||||
|
b, err := url.Parse(baseURL)
|
||||||
|
if err != nil || b.Scheme == "" || b.Host == "" {
|
||||||
|
return signed
|
||||||
|
}
|
||||||
|
s.Scheme = b.Scheme
|
||||||
|
s.Host = b.Host
|
||||||
|
return s.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Proxy) recordCacheHit(pkgPURL, versionPURL, filename string) {
|
||||||
|
_ = p.DB.RecordArtifactHit(versionPURL, filename)
|
||||||
|
if parsed, err := purl.Parse(pkgPURL); err == nil {
|
||||||
|
metrics.RecordCacheHit(purl.PURLTypeToEcosystem(parsed.Type))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Proxy) fetchAndCache(ctx context.Context, ecosystem, name, version, filename, pkgPURL, versionPURL string) (*CacheResult, error) {
|
func (p *Proxy) fetchAndCache(ctx context.Context, ecosystem, name, version, filename, pkgPURL, versionPURL string) (*CacheResult, error) {
|
||||||
|
|
@ -276,6 +348,15 @@ func (p *Proxy) updateCacheDB(ecosystem, name, filename, pkgPURL, versionPURL, u
|
||||||
|
|
||||||
// ServeArtifact writes a CacheResult to an HTTP response.
|
// ServeArtifact writes a CacheResult to an HTTP response.
|
||||||
func ServeArtifact(w http.ResponseWriter, result *CacheResult) {
|
func ServeArtifact(w http.ResponseWriter, result *CacheResult) {
|
||||||
|
if result.RedirectURL != "" {
|
||||||
|
if result.Hash != "" {
|
||||||
|
w.Header().Set("ETag", fmt.Sprintf(`"%s"`, result.Hash))
|
||||||
|
}
|
||||||
|
w.Header().Set("Location", result.RedirectURL)
|
||||||
|
w.WriteHeader(http.StatusFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
defer func() { _ = result.Reader.Close() }()
|
defer func() { _ = result.Reader.Close() }()
|
||||||
|
|
||||||
if result.ContentType != "" {
|
if result.ContentType != "" {
|
||||||
|
|
@ -396,7 +477,7 @@ func (p *Proxy) FetchOrCacheMetadata(ctx context.Context, ecosystem, cacheKey, u
|
||||||
cached, readErr := p.Storage.Open(ctx, entry.StoragePath)
|
cached, readErr := p.Storage.Open(ctx, entry.StoragePath)
|
||||||
if readErr == nil {
|
if readErr == nil {
|
||||||
defer func() { _ = cached.Close() }()
|
defer func() { _ = cached.Close() }()
|
||||||
data, readErr := ReadMetadata(cached)
|
data, readErr := p.ReadMetadata(cached)
|
||||||
if readErr == nil {
|
if readErr == nil {
|
||||||
ct := contentTypeJSON
|
ct := contentTypeJSON
|
||||||
if entry.ContentType.Valid {
|
if entry.ContentType.Valid {
|
||||||
|
|
@ -441,7 +522,7 @@ func (p *Proxy) FetchOrCacheMetadata(ctx context.Context, ecosystem, cacheKey, u
|
||||||
}
|
}
|
||||||
defer func() { _ = cached.Close() }()
|
defer func() { _ = cached.Close() }()
|
||||||
|
|
||||||
data, readErr := ReadMetadata(cached)
|
data, readErr := p.ReadMetadata(cached)
|
||||||
if readErr != nil {
|
if readErr != nil {
|
||||||
return nil, "", fmt.Errorf("upstream failed and cached read error: %w", err)
|
return nil, "", fmt.Errorf("upstream failed and cached read error: %w", err)
|
||||||
}
|
}
|
||||||
|
|
@ -483,7 +564,7 @@ func (p *Proxy) fetchUpstreamMetadata(ctx context.Context, upstreamURL string, e
|
||||||
return nil, "", "", zeroTime, errStale304
|
return nil, "", "", zeroTime, errStale304
|
||||||
}
|
}
|
||||||
defer func() { _ = cached.Close() }()
|
defer func() { _ = cached.Close() }()
|
||||||
data, readErr := ReadMetadata(cached)
|
data, readErr := p.ReadMetadata(cached)
|
||||||
if readErr != nil {
|
if readErr != nil {
|
||||||
return nil, "", "", zeroTime, errStale304
|
return nil, "", "", zeroTime, errStale304
|
||||||
}
|
}
|
||||||
|
|
@ -505,7 +586,7 @@ func (p *Proxy) fetchUpstreamMetadata(ctx context.Context, upstreamURL string, e
|
||||||
return nil, "", "", zeroTime, fmt.Errorf("upstream returned %d", resp.StatusCode)
|
return nil, "", "", zeroTime, fmt.Errorf("upstream returned %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
body, err := ReadMetadata(resp.Body)
|
body, err := p.ReadMetadata(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", "", zeroTime, fmt.Errorf("reading response: %w", err)
|
return nil, "", "", zeroTime, fmt.Errorf("reading response: %w", err)
|
||||||
}
|
}
|
||||||
|
|
@ -602,9 +683,14 @@ func (p *Proxy) ProxyCached(w http.ResponseWriter, r *http.Request, upstreamURL,
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p.writeMetadataCachedResponse(w, r, ecosystem, cacheKey, body, contentType)
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeMetadataCachedResponse writes a cached metadata response and handles
|
||||||
|
// conditional request headers using metadata cache validators.
|
||||||
|
func (p *Proxy) writeMetadataCachedResponse(w http.ResponseWriter, r *http.Request, ecosystem, cacheKey string, body []byte, contentType string) {
|
||||||
cm := p.lookupCachedMeta(ecosystem, cacheKey)
|
cm := p.lookupCachedMeta(ecosystem, cacheKey)
|
||||||
|
|
||||||
// Honor client conditional request headers
|
|
||||||
if cm.etag != "" {
|
if cm.etag != "" {
|
||||||
if match := r.Header.Get("If-None-Match"); match != "" && match == cm.etag {
|
if match := r.Header.Get("If-None-Match"); match != "" && match == cm.etag {
|
||||||
w.WriteHeader(http.StatusNotModified)
|
w.WriteHeader(http.StatusNotModified)
|
||||||
|
|
@ -650,7 +736,7 @@ func (p *Proxy) proxyMetadataStream(w http.ResponseWriter, r *http.Request, upst
|
||||||
}
|
}
|
||||||
req.Header.Set("Accept", accept)
|
req.Header.Set("Accept", accept)
|
||||||
|
|
||||||
for _, header := range []string{"Accept-Encoding", "If-Modified-Since", "If-None-Match"} {
|
for _, header := range []string{headerAcceptEncoding, "If-Modified-Since", "If-None-Match"} {
|
||||||
if v := r.Header.Get(header); v != "" {
|
if v := r.Header.Get(header); v != "" {
|
||||||
req.Header.Set(header, v)
|
req.Header.Set(header, v)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ type mockStorage struct {
|
||||||
files map[string][]byte
|
files map[string][]byte
|
||||||
storeErr error
|
storeErr error
|
||||||
openErr error
|
openErr error
|
||||||
|
signedURL string
|
||||||
|
signErr error
|
||||||
}
|
}
|
||||||
|
|
||||||
func newMockStorage() *mockStorage {
|
func newMockStorage() *mockStorage {
|
||||||
|
|
@ -79,6 +81,16 @@ func (s *mockStorage) UsedSpace(_ context.Context) (int64, error) {
|
||||||
return total, nil
|
return total, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *mockStorage) SignedURL(_ context.Context, _ string, _ time.Duration) (string, error) {
|
||||||
|
if s.signErr != nil {
|
||||||
|
return "", s.signErr
|
||||||
|
}
|
||||||
|
if s.signedURL == "" {
|
||||||
|
return "", storage.ErrSignedURLUnsupported
|
||||||
|
}
|
||||||
|
return s.signedURL, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (s *mockStorage) URL() string { return "mem://" }
|
func (s *mockStorage) URL() string { return "mem://" }
|
||||||
|
|
||||||
func (s *mockStorage) Close() error { return nil }
|
func (s *mockStorage) Close() error { return nil }
|
||||||
|
|
@ -87,6 +99,7 @@ func (s *mockStorage) Close() error { return nil }
|
||||||
type mockFetcher struct {
|
type mockFetcher struct {
|
||||||
artifact *fetch.Artifact
|
artifact *fetch.Artifact
|
||||||
fetchErr error
|
fetchErr error
|
||||||
|
fetchErrByURL map[string]error
|
||||||
fetchCalled bool
|
fetchCalled bool
|
||||||
fetchedURL string
|
fetchedURL string
|
||||||
}
|
}
|
||||||
|
|
@ -98,6 +111,11 @@ func (f *mockFetcher) Fetch(ctx context.Context, url string) (*fetch.Artifact, e
|
||||||
func (f *mockFetcher) FetchWithHeaders(_ context.Context, url string, _ http.Header) (*fetch.Artifact, error) {
|
func (f *mockFetcher) FetchWithHeaders(_ context.Context, url string, _ http.Header) (*fetch.Artifact, error) {
|
||||||
f.fetchCalled = true
|
f.fetchCalled = true
|
||||||
f.fetchedURL = url
|
f.fetchedURL = url
|
||||||
|
if f.fetchErrByURL != nil {
|
||||||
|
if err, ok := f.fetchErrByURL[url]; ok {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
if f.fetchErr != nil {
|
if f.fetchErr != nil {
|
||||||
return nil, f.fetchErr
|
return nil, f.fetchErr
|
||||||
}
|
}
|
||||||
|
|
@ -311,6 +329,213 @@ func TestGetOrFetchArtifactFromURL_CacheMiss_StorageMissing(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetOrFetchArtifact_DirectServe_Redirect(t *testing.T) {
|
||||||
|
proxy, db, store, fetcher := setupTestProxy(t)
|
||||||
|
seedPackage(t, db, store, "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz", "cached content")
|
||||||
|
|
||||||
|
proxy.DirectServe = true
|
||||||
|
proxy.DirectServeTTL = 15 * time.Minute
|
||||||
|
store.signedURL = "https://bucket.s3.amazonaws.com/npm/lodash?X-Amz-Signature=abc"
|
||||||
|
|
||||||
|
result, err := proxy.GetOrFetchArtifact(context.Background(), "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !result.Cached {
|
||||||
|
t.Error("expected result to be cached")
|
||||||
|
}
|
||||||
|
if result.RedirectURL != store.signedURL {
|
||||||
|
t.Errorf("RedirectURL = %q, want %q", result.RedirectURL, store.signedURL)
|
||||||
|
}
|
||||||
|
if result.Reader != nil {
|
||||||
|
t.Error("Reader should be nil when redirecting")
|
||||||
|
}
|
||||||
|
if fetcher.fetchCalled {
|
||||||
|
t.Error("fetcher should not be called on cache hit")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hit count should still be recorded on the redirect path.
|
||||||
|
art, _ := db.GetArtifact("pkg:npm/lodash@4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if art == nil || art.HitCount != 1 {
|
||||||
|
t.Errorf("artifact hit count not recorded: %+v", art)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetOrFetchArtifact_DirectServe_BaseURLRewrite(t *testing.T) {
|
||||||
|
proxy, db, store, _ := setupTestProxy(t)
|
||||||
|
seedPackage(t, db, store, "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz", "cached content")
|
||||||
|
|
||||||
|
proxy.DirectServe = true
|
||||||
|
proxy.DirectServeBaseURL = "https://cdn.example.com"
|
||||||
|
store.signedURL = "http://127.0.0.1:9000/bucket/npm/lodash?X-Amz-Signature=abc&X-Amz-Expires=900"
|
||||||
|
|
||||||
|
result, err := proxy.GetOrFetchArtifact(context.Background(), "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
want := "https://cdn.example.com/bucket/npm/lodash?X-Amz-Signature=abc&X-Amz-Expires=900"
|
||||||
|
if result.RedirectURL != want {
|
||||||
|
t.Errorf("RedirectURL = %q, want %q", result.RedirectURL, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRewriteSignedURLHost(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
signed string
|
||||||
|
baseURL string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"empty base url is no-op",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
"",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"replaces scheme and host",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
"https://cdn.example.com",
|
||||||
|
"https://cdn.example.com/bucket/key?sig=abc",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"preserves path and query",
|
||||||
|
"http://minio:9000/bucket/npm/lodash/4.17.21/lodash.tgz?X-Amz-Signature=abc&X-Amz-Date=20260101",
|
||||||
|
"https://files.example.com",
|
||||||
|
"https://files.example.com/bucket/npm/lodash/4.17.21/lodash.tgz?X-Amz-Signature=abc&X-Amz-Date=20260101",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ignores base url path",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
"https://cdn.example.com/ignored",
|
||||||
|
"https://cdn.example.com/bucket/key?sig=abc",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"invalid base url is no-op",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
"://bad",
|
||||||
|
"http://127.0.0.1:9000/bucket/key?sig=abc",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got := rewriteSignedURLHost(tt.signed, tt.baseURL)
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf("rewriteSignedURLHost(%q, %q) = %q, want %q", tt.signed, tt.baseURL, got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetOrFetchArtifact_DirectServe_FallbackOnUnsupported(t *testing.T) {
|
||||||
|
proxy, db, store, _ := setupTestProxy(t)
|
||||||
|
seedPackage(t, db, store, "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz", "cached content")
|
||||||
|
|
||||||
|
proxy.DirectServe = true
|
||||||
|
// store.signedURL is empty so SignedURL returns ErrSignedURLUnsupported.
|
||||||
|
|
||||||
|
result, err := proxy.GetOrFetchArtifact(context.Background(), "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = result.Reader.Close() }()
|
||||||
|
|
||||||
|
if result.RedirectURL != "" {
|
||||||
|
t.Errorf("RedirectURL should be empty, got %q", result.RedirectURL)
|
||||||
|
}
|
||||||
|
if result.Reader == nil {
|
||||||
|
t.Fatal("Reader should be set when signing is unsupported")
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(result.Reader)
|
||||||
|
if string(body) != "cached content" {
|
||||||
|
t.Errorf("got body %q, want %q", body, "cached content")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetOrFetchArtifact_DirectServe_FallbackOnError(t *testing.T) {
|
||||||
|
proxy, db, store, _ := setupTestProxy(t)
|
||||||
|
seedPackage(t, db, store, "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz", "cached content")
|
||||||
|
|
||||||
|
proxy.DirectServe = true
|
||||||
|
store.signErr = errors.New("signing failed")
|
||||||
|
|
||||||
|
result, err := proxy.GetOrFetchArtifact(context.Background(), "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = result.Reader.Close() }()
|
||||||
|
|
||||||
|
if result.RedirectURL != "" {
|
||||||
|
t.Errorf("RedirectURL should be empty on signing error, got %q", result.RedirectURL)
|
||||||
|
}
|
||||||
|
if result.Reader == nil {
|
||||||
|
t.Fatal("Reader should be set when signing fails")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetOrFetchArtifact_DirectServe_DisabledIgnoresSigning(t *testing.T) {
|
||||||
|
proxy, db, store, _ := setupTestProxy(t)
|
||||||
|
seedPackage(t, db, store, "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz", "cached content")
|
||||||
|
|
||||||
|
proxy.DirectServe = false
|
||||||
|
store.signedURL = "https://bucket.example/should-not-be-used"
|
||||||
|
|
||||||
|
result, err := proxy.GetOrFetchArtifact(context.Background(), "npm", "lodash", "4.17.21", "lodash-4.17.21.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = result.Reader.Close() }()
|
||||||
|
|
||||||
|
if result.RedirectURL != "" {
|
||||||
|
t.Errorf("RedirectURL should be empty when DirectServe is off, got %q", result.RedirectURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeArtifact_Redirect(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
ServeArtifact(w, &CacheResult{
|
||||||
|
RedirectURL: "https://bucket.s3.amazonaws.com/file?sig=abc",
|
||||||
|
Hash: "abc123",
|
||||||
|
Cached: true,
|
||||||
|
})
|
||||||
|
|
||||||
|
if w.Code != http.StatusFound {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusFound)
|
||||||
|
}
|
||||||
|
if loc := w.Header().Get("Location"); loc != "https://bucket.s3.amazonaws.com/file?sig=abc" {
|
||||||
|
t.Errorf("Location = %q", loc)
|
||||||
|
}
|
||||||
|
if etag := w.Header().Get("ETag"); etag != `"abc123"` {
|
||||||
|
t.Errorf("ETag = %q, want %q", etag, `"abc123"`)
|
||||||
|
}
|
||||||
|
if cl := w.Header().Get("Content-Length"); cl != "" {
|
||||||
|
t.Errorf("Content-Length should not be set on redirect, got %q", cl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeArtifact_Stream(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
ServeArtifact(w, &CacheResult{
|
||||||
|
Reader: io.NopCloser(strings.NewReader("payload")),
|
||||||
|
Size: 7,
|
||||||
|
ContentType: "application/octet-stream",
|
||||||
|
Hash: "abc123",
|
||||||
|
})
|
||||||
|
|
||||||
|
if w.Code != http.StatusOK {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
|
||||||
|
}
|
||||||
|
if w.Body.String() != "payload" {
|
||||||
|
t.Errorf("body = %q, want %q", w.Body.String(), "payload")
|
||||||
|
}
|
||||||
|
if ct := w.Header().Get("Content-Type"); ct != "application/octet-stream" {
|
||||||
|
t.Errorf("Content-Type = %q", ct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestGetOrFetchArtifactFromURL_CacheHit(t *testing.T) {
|
func TestGetOrFetchArtifactFromURL_CacheHit(t *testing.T) {
|
||||||
proxy, db, store, fetcher := setupTestProxy(t)
|
proxy, db, store, fetcher := setupTestProxy(t)
|
||||||
seedPackage(t, db, store, "pypi", "requests", "2.28.0", "requests-2.28.0.tar.gz", "pypi content")
|
seedPackage(t, db, store, "pypi", "requests", "2.28.0", "requests-2.28.0.tar.gz", "pypi content")
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
"google.golang.org/protobuf/encoding/protowire"
|
"google.golang.org/protobuf/encoding/protowire"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
140
internal/handler/integrity.go
Normal file
140
internal/handler/integrity.go
Normal file
|
|
@ -0,0 +1,140 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"crypto/sha512"
|
||||||
|
"crypto/subtle"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"hash"
|
||||||
|
"io"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// parseSRI parses a Subresource Integrity string (e.g. "sha512-abc==") into
|
||||||
|
// an algorithm name and raw digest bytes. Returns ok=false for empty,
|
||||||
|
// malformed, or unsupported entries. Only the first hash in a multi-hash
|
||||||
|
// SRI string is considered.
|
||||||
|
func parseSRI(s string) (algo string, digest []byte, ok bool) {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if s == "" {
|
||||||
|
return "", nil, false
|
||||||
|
}
|
||||||
|
if i := strings.IndexByte(s, ' '); i >= 0 {
|
||||||
|
s = s[:i]
|
||||||
|
}
|
||||||
|
algo, b64, found := strings.Cut(s, "-")
|
||||||
|
if !found {
|
||||||
|
return "", nil, false
|
||||||
|
}
|
||||||
|
d, err := base64.StdEncoding.DecodeString(b64)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, false
|
||||||
|
}
|
||||||
|
switch algo {
|
||||||
|
case "sha256", "sha384", "sha512":
|
||||||
|
return algo, d, true
|
||||||
|
default:
|
||||||
|
return "", nil, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSRIHash(algo string) hash.Hash {
|
||||||
|
switch algo {
|
||||||
|
case "sha256":
|
||||||
|
return sha256.New()
|
||||||
|
case "sha384":
|
||||||
|
return sha512.New384()
|
||||||
|
case "sha512":
|
||||||
|
return sha512.New()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// verifyingReader wraps an io.ReadCloser and computes SHA256 (and optionally
|
||||||
|
// a second SRI hash) as bytes are read. When the underlying reader reaches
|
||||||
|
// EOF it compares the digests against the expected values and calls
|
||||||
|
// onMismatch for each failure. Verification is skipped if the stream was
|
||||||
|
// not fully consumed (e.g. client disconnect) to avoid false positives.
|
||||||
|
type verifyingReader struct {
|
||||||
|
r io.ReadCloser
|
||||||
|
sha256 hash.Hash
|
||||||
|
wantSHA256 string
|
||||||
|
sri hash.Hash
|
||||||
|
sriAlgo string
|
||||||
|
wantSRI []byte
|
||||||
|
onMismatch func(reason string)
|
||||||
|
eof bool
|
||||||
|
verified bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func newVerifyingReader(r io.ReadCloser, contentHash, sri string, onMismatch func(string)) io.ReadCloser {
|
||||||
|
if contentHash == "" && sri == "" {
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
v := &verifyingReader{
|
||||||
|
r: r,
|
||||||
|
onMismatch: onMismatch,
|
||||||
|
}
|
||||||
|
if contentHash != "" {
|
||||||
|
v.sha256 = sha256.New()
|
||||||
|
v.wantSHA256 = contentHash
|
||||||
|
}
|
||||||
|
if algo, digest, ok := parseSRI(sri); ok {
|
||||||
|
v.sri = newSRIHash(algo)
|
||||||
|
v.sriAlgo = algo
|
||||||
|
v.wantSRI = digest
|
||||||
|
}
|
||||||
|
if v.sha256 == nil && v.sri == nil {
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *verifyingReader) Read(p []byte) (int, error) {
|
||||||
|
n, err := v.r.Read(p)
|
||||||
|
if n > 0 {
|
||||||
|
if v.sha256 != nil {
|
||||||
|
v.sha256.Write(p[:n])
|
||||||
|
}
|
||||||
|
if v.sri != nil {
|
||||||
|
v.sri.Write(p[:n])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err == io.EOF {
|
||||||
|
v.eof = true
|
||||||
|
v.verify()
|
||||||
|
}
|
||||||
|
return n, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *verifyingReader) Close() error {
|
||||||
|
if v.eof {
|
||||||
|
v.verify()
|
||||||
|
}
|
||||||
|
return v.r.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *verifyingReader) verify() {
|
||||||
|
if v.verified {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
v.verified = true
|
||||||
|
|
||||||
|
if v.sha256 != nil {
|
||||||
|
got := hex.EncodeToString(v.sha256.Sum(nil))
|
||||||
|
if subtle.ConstantTimeCompare([]byte(got), []byte(v.wantSHA256)) != 1 {
|
||||||
|
v.onMismatch(fmt.Sprintf("content_hash mismatch: stored=%s computed=%s", v.wantSHA256, got))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if v.sri != nil {
|
||||||
|
got := v.sri.Sum(nil)
|
||||||
|
if subtle.ConstantTimeCompare(got, v.wantSRI) != 1 {
|
||||||
|
v.onMismatch(fmt.Sprintf("integrity mismatch: %s expected=%s computed=%s",
|
||||||
|
v.sriAlgo,
|
||||||
|
base64.StdEncoding.EncodeToString(v.wantSRI),
|
||||||
|
base64.StdEncoding.EncodeToString(got)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
136
internal/handler/integrity_test.go
Normal file
136
internal/handler/integrity_test.go
Normal file
|
|
@ -0,0 +1,136 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"crypto/sha512"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/hex"
|
||||||
|
"io"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func sha256Hex(data string) string {
|
||||||
|
sum := sha256.Sum256([]byte(data))
|
||||||
|
return hex.EncodeToString(sum[:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func sha512SRI(data string) string {
|
||||||
|
sum := sha512.Sum512([]byte(data))
|
||||||
|
return "sha512-" + base64.StdEncoding.EncodeToString(sum[:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseSRI(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
input string
|
||||||
|
algo string
|
||||||
|
ok bool
|
||||||
|
}{
|
||||||
|
{"sha512", sha512SRI("hello"), "sha512", true},
|
||||||
|
{"sha256", "sha256-" + base64.StdEncoding.EncodeToString([]byte("0123456789012345678901234567890123456789")), "sha256", true},
|
||||||
|
{"empty", "", "", false},
|
||||||
|
{"no dash", "sha512abc", "", false},
|
||||||
|
{"bad base64", "sha512-not!base64", "", false},
|
||||||
|
{"unsupported algo", "md5-" + base64.StdEncoding.EncodeToString([]byte("x")), "", false},
|
||||||
|
{"multi hash takes first", sha512SRI("a") + " " + sha512SRI("b"), "sha512", true},
|
||||||
|
{"whitespace", " " + sha512SRI("x") + " ", "sha512", true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
algo, digest, ok := parseSRI(tt.input)
|
||||||
|
if ok != tt.ok {
|
||||||
|
t.Fatalf("ok = %v, want %v", ok, tt.ok)
|
||||||
|
}
|
||||||
|
if !tt.ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if algo != tt.algo {
|
||||||
|
t.Errorf("algo = %q, want %q", algo, tt.algo)
|
||||||
|
}
|
||||||
|
if len(digest) == 0 {
|
||||||
|
t.Error("digest is empty")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerifyingReader(t *testing.T) {
|
||||||
|
const data = "hello world"
|
||||||
|
goodSHA := sha256Hex(data)
|
||||||
|
goodSRI := sha512SRI(data)
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
hash string
|
||||||
|
sri string
|
||||||
|
wantCalls int
|
||||||
|
}{
|
||||||
|
{"both match", goodSHA, goodSRI, 0},
|
||||||
|
{"sha256 only match", goodSHA, "", 0},
|
||||||
|
{"sri only match", "", goodSRI, 0},
|
||||||
|
{"sha256 mismatch", sha256Hex("other"), "", 1},
|
||||||
|
{"sri mismatch", "", sha512SRI("other"), 1},
|
||||||
|
{"both mismatch", sha256Hex("other"), sha512SRI("other"), 2},
|
||||||
|
{"no checks", "", "", 0},
|
||||||
|
{"unparseable sri ignored", goodSHA, "garbage", 0},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
var calls []string
|
||||||
|
r := newVerifyingReader(io.NopCloser(strings.NewReader(data)), tt.hash, tt.sri,
|
||||||
|
func(reason string) { calls = append(calls, reason) })
|
||||||
|
|
||||||
|
got, err := io.ReadAll(r)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ReadAll: %v", err)
|
||||||
|
}
|
||||||
|
if string(got) != data {
|
||||||
|
t.Errorf("data corrupted: got %q", got)
|
||||||
|
}
|
||||||
|
if err := r.Close(); err != nil {
|
||||||
|
t.Fatalf("Close: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(calls) != tt.wantCalls {
|
||||||
|
t.Errorf("onMismatch called %d times, want %d: %v", len(calls), tt.wantCalls, calls)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerifyingReaderPassthrough(t *testing.T) {
|
||||||
|
src := io.NopCloser(strings.NewReader("x"))
|
||||||
|
r := newVerifyingReader(src, "", "", func(string) { t.Fatal("should not be called") })
|
||||||
|
if r != src {
|
||||||
|
t.Error("expected passthrough when no hashes provided")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerifyingReaderPartialRead(t *testing.T) {
|
||||||
|
var calls int
|
||||||
|
r := newVerifyingReader(io.NopCloser(strings.NewReader("hello world")),
|
||||||
|
sha256Hex("hello world"), "", func(string) { calls++ })
|
||||||
|
|
||||||
|
buf := make([]byte, 5)
|
||||||
|
_, _ = r.Read(buf)
|
||||||
|
_ = r.Close()
|
||||||
|
|
||||||
|
if calls != 0 {
|
||||||
|
t.Errorf("onMismatch called %d times for partial read, want 0", calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerifyingReaderVerifyOnce(t *testing.T) {
|
||||||
|
var calls int
|
||||||
|
r := newVerifyingReader(io.NopCloser(strings.NewReader("x")), sha256Hex("y"), "",
|
||||||
|
func(string) { calls++ })
|
||||||
|
_, _ = io.ReadAll(r)
|
||||||
|
_ = r.Close()
|
||||||
|
_ = r.Close()
|
||||||
|
if calls != 1 {
|
||||||
|
t.Errorf("onMismatch called %d times, want 1", calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
347
internal/handler/julia.go
Normal file
347
internal/handler/julia.go
Normal file
|
|
@ -0,0 +1,347 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"bufio"
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/BurntSushi/toml"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
juliaUpstream = "https://pkg.julialang.org"
|
||||||
|
juliaGeneralRegistryUUID = "23338594-aafe-5451-b93e-139f81909106"
|
||||||
|
juliaArtifactName = "_artifact"
|
||||||
|
juliaRegistryName = "_registry"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
juliaHexPattern = regexp.MustCompile(`^[0-9a-f]{40,64}$`)
|
||||||
|
juliaUUIDPattern = regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// JuliaHandler handles Julia Pkg server protocol requests.
|
||||||
|
//
|
||||||
|
// See https://pkgdocs.julialang.org/v1/registries/ and the PkgServer.jl
|
||||||
|
// reference implementation. The protocol is content-addressed: registry,
|
||||||
|
// package and artifact resources are all identified by git tree hashes
|
||||||
|
// and are immutable once published.
|
||||||
|
type JuliaHandler struct {
|
||||||
|
proxy *Proxy
|
||||||
|
upstreamURL string
|
||||||
|
|
||||||
|
mu sync.RWMutex
|
||||||
|
names map[string]string
|
||||||
|
namesHash string
|
||||||
|
loadMu sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewJuliaHandler creates a new Julia Pkg server handler.
|
||||||
|
func NewJuliaHandler(proxy *Proxy, _ string) *JuliaHandler {
|
||||||
|
return &JuliaHandler{
|
||||||
|
proxy: proxy,
|
||||||
|
upstreamURL: juliaUpstream,
|
||||||
|
names: make(map[string]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Routes returns the HTTP handler for Julia requests.
|
||||||
|
func (h *JuliaHandler) Routes() http.Handler {
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
|
||||||
|
mux.HandleFunc("GET /registries", h.handleRegistries)
|
||||||
|
mux.HandleFunc("GET /registries.eager", h.handleRegistries)
|
||||||
|
mux.HandleFunc("GET /registries.conservative", h.handleRegistries)
|
||||||
|
mux.HandleFunc("GET /registry/{uuid}/{hash}", h.handleRegistry)
|
||||||
|
mux.HandleFunc("GET /package/{uuid}/{hash}", h.handlePackage)
|
||||||
|
mux.HandleFunc("GET /artifact/{hash}", h.handleArtifact)
|
||||||
|
mux.HandleFunc("GET /meta", h.proxyUpstream)
|
||||||
|
|
||||||
|
return mux
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleRegistries serves the list of available registries. This is the only
|
||||||
|
// mutable endpoint in the protocol so it goes through the metadata cache.
|
||||||
|
func (h *JuliaHandler) handleRegistries(w http.ResponseWriter, r *http.Request) {
|
||||||
|
cacheKey := strings.TrimPrefix(r.URL.Path, "/")
|
||||||
|
h.proxy.ProxyCached(w, r, h.upstreamURL+r.URL.Path, "julia", cacheKey, "*/*")
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleRegistry serves an immutable registry tarball and refreshes the
|
||||||
|
// UUID→name map from its Registry.toml.
|
||||||
|
func (h *JuliaHandler) handleRegistry(w http.ResponseWriter, r *http.Request) {
|
||||||
|
uuid := r.PathValue("uuid")
|
||||||
|
hash := r.PathValue("hash")
|
||||||
|
if !validJuliaUUID(uuid) || !juliaHexPattern.MatchString(hash) {
|
||||||
|
http.Error(w, "invalid registry reference", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.proxy.Logger.Info("julia registry request", "uuid", uuid, "hash", hash)
|
||||||
|
|
||||||
|
upstreamURL := h.upstreamURL + r.URL.Path
|
||||||
|
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "julia", juliaRegistryName, hash, hash+".tar.gz", upstreamURL)
|
||||||
|
if err != nil {
|
||||||
|
h.proxy.Logger.Error("failed to get registry", "error", err)
|
||||||
|
http.Error(w, "failed to fetch registry", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
go h.refreshNamesFromRegistry(uuid, hash)
|
||||||
|
|
||||||
|
ServeArtifact(w, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePackage serves an immutable package source tarball.
|
||||||
|
func (h *JuliaHandler) handlePackage(w http.ResponseWriter, r *http.Request) {
|
||||||
|
uuid := r.PathValue("uuid")
|
||||||
|
hash := r.PathValue("hash")
|
||||||
|
if !validJuliaUUID(uuid) || !juliaHexPattern.MatchString(hash) {
|
||||||
|
http.Error(w, "invalid package reference", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := h.ensureNames(r.Context()); err != nil {
|
||||||
|
h.proxy.Logger.Warn("julia name map unavailable, using uuid", "error", err)
|
||||||
|
}
|
||||||
|
name := h.resolveName(uuid)
|
||||||
|
|
||||||
|
h.proxy.Logger.Info("julia package request", "name", name, "uuid", uuid, "hash", hash)
|
||||||
|
|
||||||
|
upstreamURL := h.upstreamURL + r.URL.Path
|
||||||
|
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "julia", name, hash, hash+".tar.gz", upstreamURL)
|
||||||
|
if err != nil {
|
||||||
|
h.proxy.Logger.Error("failed to get package", "error", err)
|
||||||
|
http.Error(w, "failed to fetch package", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ServeArtifact(w, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleArtifact serves an immutable binary artifact tarball. Artifacts are
|
||||||
|
// anonymous content-addressed blobs with no associated package name.
|
||||||
|
func (h *JuliaHandler) handleArtifact(w http.ResponseWriter, r *http.Request) {
|
||||||
|
hash := r.PathValue("hash")
|
||||||
|
if !juliaHexPattern.MatchString(hash) {
|
||||||
|
http.Error(w, "invalid artifact hash", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.proxy.Logger.Info("julia artifact request", "hash", hash)
|
||||||
|
|
||||||
|
upstreamURL := h.upstreamURL + r.URL.Path
|
||||||
|
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "julia", juliaArtifactName, hash, hash+".tar.gz", upstreamURL)
|
||||||
|
if err != nil {
|
||||||
|
h.proxy.Logger.Error("failed to get artifact", "error", err)
|
||||||
|
http.Error(w, "failed to fetch artifact", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ServeArtifact(w, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// proxyUpstream forwards a request to the upstream Pkg server without caching.
|
||||||
|
func (h *JuliaHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
||||||
|
h.proxy.ProxyUpstream(w, r, h.upstreamURL+r.URL.Path, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveName returns the human-readable package name for a UUID, falling
|
||||||
|
// back to the UUID itself if it is not present in the loaded registry.
|
||||||
|
func (h *JuliaHandler) resolveName(uuid string) string {
|
||||||
|
h.mu.RLock()
|
||||||
|
defer h.mu.RUnlock()
|
||||||
|
if name, ok := h.names[uuid]; ok {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
return uuid
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensureNames lazily populates the UUID→name map from the General registry.
|
||||||
|
// Returns immediately if the map is already populated; otherwise blocks until
|
||||||
|
// a single in-flight load completes. Failed loads are retried on the next call.
|
||||||
|
func (h *JuliaHandler) ensureNames(ctx context.Context) error {
|
||||||
|
if h.namesLoaded() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
h.loadMu.Lock()
|
||||||
|
defer h.loadMu.Unlock()
|
||||||
|
|
||||||
|
if h.namesLoaded() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return h.loadNamesFromUpstream(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *JuliaHandler) namesLoaded() bool {
|
||||||
|
h.mu.RLock()
|
||||||
|
defer h.mu.RUnlock()
|
||||||
|
return len(h.names) > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadNamesFromUpstream fetches the current /registries listing, downloads the
|
||||||
|
// General registry tarball at its current hash, and parses Registry.toml.
|
||||||
|
func (h *JuliaHandler) loadNamesFromUpstream(ctx context.Context) error {
|
||||||
|
hash, err := h.fetchGeneralRegistryHash(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return h.loadRegistryTarball(ctx, juliaGeneralRegistryUUID, hash)
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetchGeneralRegistryHash reads /registries and returns the current tree hash
|
||||||
|
// for the General registry.
|
||||||
|
func (h *JuliaHandler) fetchGeneralRegistryHash(ctx context.Context) (string, error) {
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, h.upstreamURL+"/registries", nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return "", fmt.Errorf("upstream /registries returned %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner := bufio.NewScanner(resp.Body)
|
||||||
|
for scanner.Scan() {
|
||||||
|
uuid, hash, ok := parseRegistryLine(scanner.Text())
|
||||||
|
if ok && uuid == juliaGeneralRegistryUUID {
|
||||||
|
return hash, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := scanner.Err(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("general registry not listed in /registries")
|
||||||
|
}
|
||||||
|
|
||||||
|
// refreshNamesFromRegistry reloads the UUID→name map from a registry tarball
|
||||||
|
// that has just been cached. Errors are logged but do not affect the response.
|
||||||
|
func (h *JuliaHandler) refreshNamesFromRegistry(uuid, hash string) {
|
||||||
|
if uuid != juliaGeneralRegistryUUID {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
h.mu.RLock()
|
||||||
|
current := h.namesHash
|
||||||
|
h.mu.RUnlock()
|
||||||
|
if current == hash {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.loadRegistryTarball(context.Background(), uuid, hash); err != nil {
|
||||||
|
h.proxy.Logger.Warn("failed to refresh julia name map", "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadRegistryTarball downloads a registry tarball and replaces the name map
|
||||||
|
// with the contents of its Registry.toml.
|
||||||
|
func (h *JuliaHandler) loadRegistryTarball(ctx context.Context, uuid, hash string) error {
|
||||||
|
url := fmt.Sprintf("%s/registry/%s/%s", h.upstreamURL, uuid, hash)
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return fmt.Errorf("upstream registry returned %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
names, err := extractRegistryNames(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
h.mu.Lock()
|
||||||
|
h.names = names
|
||||||
|
h.namesHash = hash
|
||||||
|
h.mu.Unlock()
|
||||||
|
|
||||||
|
h.proxy.Logger.Info("loaded julia registry name map", "packages", len(names), "hash", hash)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// extractRegistryNames reads a gzipped registry tarball, finds Registry.toml
|
||||||
|
// at the root, and returns its [packages] table as a UUID→name map.
|
||||||
|
func extractRegistryNames(r io.Reader) (map[string]string, error) {
|
||||||
|
gz, err := gzip.NewReader(r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("opening gzip stream: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = gz.Close() }()
|
||||||
|
|
||||||
|
tr := tar.NewReader(gz)
|
||||||
|
for {
|
||||||
|
hdr, err := tr.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
return nil, fmt.Errorf("no Registry.toml in tarball")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if strings.TrimPrefix(hdr.Name, "./") != "Registry.toml" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := io.ReadAll(tr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return parseRegistryToml(data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type juliaRegistryFile struct {
|
||||||
|
Packages map[string]struct {
|
||||||
|
Name string `toml:"name"`
|
||||||
|
} `toml:"packages"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseRegistryToml decodes the [packages] table of a Registry.toml file.
|
||||||
|
func parseRegistryToml(data []byte) (map[string]string, error) {
|
||||||
|
var reg juliaRegistryFile
|
||||||
|
if _, err := toml.NewDecoder(bytes.NewReader(data)).Decode(®); err != nil {
|
||||||
|
return nil, fmt.Errorf("parsing Registry.toml: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
names := make(map[string]string, len(reg.Packages))
|
||||||
|
for uuid, pkg := range reg.Packages {
|
||||||
|
if pkg.Name != "" {
|
||||||
|
names[uuid] = pkg.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return names, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseRegistryLine parses a single line from /registries of the form
|
||||||
|
// "/registry/{uuid}/{hash}" and returns the uuid and hash.
|
||||||
|
func parseRegistryLine(line string) (uuid, hash string, ok bool) {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
line = strings.TrimPrefix(line, "/registry/")
|
||||||
|
uuid, hash, found := strings.Cut(line, "/")
|
||||||
|
if !found || !validJuliaUUID(uuid) || !juliaHexPattern.MatchString(hash) {
|
||||||
|
return "", "", false
|
||||||
|
}
|
||||||
|
return uuid, hash, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// validJuliaUUID reports whether s looks like a lowercase RFC 4122 UUID.
|
||||||
|
func validJuliaUUID(s string) bool {
|
||||||
|
return juliaUUIDPattern.MatchString(s)
|
||||||
|
}
|
||||||
167
internal/handler/julia_test.go
Normal file
167
internal/handler/julia_test.go
Normal file
|
|
@ -0,0 +1,167 @@
|
||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestJuliaParseRegistryLine(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
line string
|
||||||
|
wantUUID string
|
||||||
|
wantHash string
|
||||||
|
wantOK bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"/registry/23338594-aafe-5451-b93e-139f81909106/342327538ed6c1ec54c69fa145e7b6bf5934201e",
|
||||||
|
"23338594-aafe-5451-b93e-139f81909106",
|
||||||
|
"342327538ed6c1ec54c69fa145e7b6bf5934201e",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
" /registry/23338594-aafe-5451-b93e-139f81909106/342327538ed6c1ec54c69fa145e7b6bf5934201e\n",
|
||||||
|
"23338594-aafe-5451-b93e-139f81909106",
|
||||||
|
"342327538ed6c1ec54c69fa145e7b6bf5934201e",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
{"/registry/not-a-uuid/0000", "", "", false},
|
||||||
|
{"junk", "", "", false},
|
||||||
|
{"", "", "", false},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
uuid, hash, ok := parseRegistryLine(tt.line)
|
||||||
|
if uuid != tt.wantUUID || hash != tt.wantHash || ok != tt.wantOK {
|
||||||
|
t.Errorf("parseRegistryLine(%q) = (%q, %q, %v), want (%q, %q, %v)",
|
||||||
|
tt.line, uuid, hash, ok, tt.wantUUID, tt.wantHash, tt.wantOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJuliaValidUUID(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
s string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"23338594-aafe-5451-b93e-139f81909106", true},
|
||||||
|
{"295af30f-e4ad-537b-8983-00126c2a3abe", true},
|
||||||
|
{"23338594-AAFE-5451-b93e-139f81909106", false},
|
||||||
|
{"23338594aafe5451b93e139f81909106", false},
|
||||||
|
{"23338594-aafe-5451-b93e-139f8190910", false},
|
||||||
|
{"23338594-aafe-5451-b93e-139f81909106-", false},
|
||||||
|
{"23338594-gafe-5451-b93e-139f81909106", false},
|
||||||
|
{"", false},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := validJuliaUUID(tt.s); got != tt.want {
|
||||||
|
t.Errorf("validJuliaUUID(%q) = %v, want %v", tt.s, got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJuliaParseRegistryToml(t *testing.T) {
|
||||||
|
data := []byte(`name = "General"
|
||||||
|
uuid = "23338594-aafe-5451-b93e-139f81909106"
|
||||||
|
|
||||||
|
[packages]
|
||||||
|
295af30f-e4ad-537b-8983-00126c2a3abe = { name = "Revise", path = "R/Revise" }
|
||||||
|
91a5bcdd-55d7-5caf-9e0b-520d859cae80 = { name = "Plots", path = "P/Plots" }
|
||||||
|
`)
|
||||||
|
|
||||||
|
names, err := parseRegistryToml(data)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parseRegistryToml: %v", err)
|
||||||
|
}
|
||||||
|
if got := names["295af30f-e4ad-537b-8983-00126c2a3abe"]; got != "Revise" {
|
||||||
|
t.Errorf("names[Revise uuid] = %q, want Revise", got)
|
||||||
|
}
|
||||||
|
if got := names["91a5bcdd-55d7-5caf-9e0b-520d859cae80"]; got != "Plots" {
|
||||||
|
t.Errorf("names[Plots uuid] = %q, want Plots", got)
|
||||||
|
}
|
||||||
|
if len(names) != 2 {
|
||||||
|
t.Errorf("len(names) = %d, want 2", len(names))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJuliaExtractRegistryNames(t *testing.T) {
|
||||||
|
registryToml := `name = "General"
|
||||||
|
[packages]
|
||||||
|
295af30f-e4ad-537b-8983-00126c2a3abe = { name = "Revise", path = "R/Revise" }
|
||||||
|
`
|
||||||
|
var buf bytes.Buffer
|
||||||
|
gw := gzip.NewWriter(&buf)
|
||||||
|
tw := tar.NewWriter(gw)
|
||||||
|
|
||||||
|
for _, f := range []struct{ name, body string }{
|
||||||
|
{"R/Revise/Package.toml", "name = \"Revise\"\n"},
|
||||||
|
{"Registry.toml", registryToml},
|
||||||
|
} {
|
||||||
|
if err := tw.WriteHeader(&tar.Header{Name: f.name, Mode: 0o644, Size: int64(len(f.body))}); err != nil {
|
||||||
|
t.Fatalf("WriteHeader: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := tw.Write([]byte(f.body)); err != nil {
|
||||||
|
t.Fatalf("Write: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := tw.Close(); err != nil {
|
||||||
|
t.Fatalf("tar Close: %v", err)
|
||||||
|
}
|
||||||
|
if err := gw.Close(); err != nil {
|
||||||
|
t.Fatalf("gzip Close: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
names, err := extractRegistryNames(bytes.NewReader(buf.Bytes()))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("extractRegistryNames: %v", err)
|
||||||
|
}
|
||||||
|
if got := names["295af30f-e4ad-537b-8983-00126c2a3abe"]; got != "Revise" {
|
||||||
|
t.Errorf("names[Revise uuid] = %q, want Revise", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJuliaResolveName(t *testing.T) {
|
||||||
|
h := &JuliaHandler{
|
||||||
|
proxy: &Proxy{Logger: slog.Default()},
|
||||||
|
names: map[string]string{
|
||||||
|
"295af30f-e4ad-537b-8983-00126c2a3abe": "Revise",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := h.resolveName("295af30f-e4ad-537b-8983-00126c2a3abe"); got != "Revise" {
|
||||||
|
t.Errorf("resolveName(known) = %q, want Revise", got)
|
||||||
|
}
|
||||||
|
if got := h.resolveName("00000000-0000-0000-0000-000000000000"); got != "00000000-0000-0000-0000-000000000000" {
|
||||||
|
t.Errorf("resolveName(unknown) = %q, want uuid fallback", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJuliaRoutesValidation(t *testing.T) {
|
||||||
|
h := NewJuliaHandler(&Proxy{Logger: slog.Default()}, "")
|
||||||
|
routes := h.Routes()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
path string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{"/package/not-a-uuid/342327538ed6c1ec54c69fa145e7b6bf5934201e", http.StatusBadRequest},
|
||||||
|
{"/package/295af30f-e4ad-537b-8983-00126c2a3abe/short", http.StatusBadRequest},
|
||||||
|
{"/registry/295af30f-e4ad-537b-8983-00126c2a3abe/zzzz", http.StatusBadRequest},
|
||||||
|
{"/artifact/nothex", http.StatusBadRequest},
|
||||||
|
{"/nope", http.StatusNotFound},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
req := httptest.NewRequest(http.MethodGet, tt.path, nil)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
routes.ServeHTTP(rr, req)
|
||||||
|
if rr.Code != tt.want {
|
||||||
|
t.Errorf("GET %s = %d, want %d", tt.path, rr.Code, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path"
|
"path"
|
||||||
|
|
@ -8,7 +9,8 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
mavenUpstream = "https://repo1.maven.org/maven2"
|
mavenCentralUpstream = "https://repo1.maven.org/maven2"
|
||||||
|
gradlePluginPortalUpstream = "https://plugins.gradle.org/m2"
|
||||||
minMavenParts = 4 // group path segments + artifact + version + filename
|
minMavenParts = 4 // group path segments + artifact + version + filename
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -16,14 +18,23 @@ const (
|
||||||
type MavenHandler struct {
|
type MavenHandler struct {
|
||||||
proxy *Proxy
|
proxy *Proxy
|
||||||
upstreamURL string
|
upstreamURL string
|
||||||
|
pluginPortalUpstreamURL string
|
||||||
proxyURL string
|
proxyURL string
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewMavenHandler creates a new Maven repository handler.
|
// NewMavenHandler creates a new Maven repository handler.
|
||||||
func NewMavenHandler(proxy *Proxy, proxyURL string) *MavenHandler {
|
func NewMavenHandler(proxy *Proxy, proxyURL, upstreamURL, pluginPortalUpstreamURL string) *MavenHandler {
|
||||||
|
if strings.TrimSpace(upstreamURL) == "" {
|
||||||
|
upstreamURL = mavenCentralUpstream
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(pluginPortalUpstreamURL) == "" {
|
||||||
|
pluginPortalUpstreamURL = gradlePluginPortalUpstream
|
||||||
|
}
|
||||||
|
|
||||||
return &MavenHandler{
|
return &MavenHandler{
|
||||||
proxy: proxy,
|
proxy: proxy,
|
||||||
upstreamURL: mavenUpstream,
|
upstreamURL: strings.TrimSuffix(upstreamURL, "/"),
|
||||||
|
pluginPortalUpstreamURL: strings.TrimSuffix(pluginPortalUpstreamURL, "/"),
|
||||||
proxyURL: strings.TrimSuffix(proxyURL, "/"),
|
proxyURL: strings.TrimSuffix(proxyURL, "/"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -51,8 +62,7 @@ func (h *MavenHandler) handleRequest(w http.ResponseWriter, r *http.Request) {
|
||||||
filename := path.Base(urlPath)
|
filename := path.Base(urlPath)
|
||||||
|
|
||||||
if h.isMetadataFile(filename) {
|
if h.isMetadataFile(filename) {
|
||||||
cacheKey := strings.ReplaceAll(urlPath, "/", "_")
|
h.handleMetadata(w, r, urlPath)
|
||||||
h.proxy.ProxyCached(w, r, h.upstreamURL+r.URL.Path, "maven", cacheKey, "*/*")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -66,6 +76,32 @@ func (h *MavenHandler) handleRequest(w http.ResponseWriter, r *http.Request) {
|
||||||
h.proxyUpstream(w, r)
|
h.proxyUpstream(w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *MavenHandler) handleMetadata(w http.ResponseWriter, r *http.Request, urlPath string) {
|
||||||
|
cacheKey := strings.ReplaceAll(urlPath, "/", "_")
|
||||||
|
upstreamURL := fmt.Sprintf("%s/%s", h.upstreamURL, urlPath)
|
||||||
|
|
||||||
|
body, contentType, err := h.proxy.FetchOrCacheMetadata(r.Context(), "maven", cacheKey, upstreamURL, "*/*")
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrUpstreamNotFound) {
|
||||||
|
pluginPortalURL := fmt.Sprintf("%s/%s", h.pluginPortalUpstreamURL, urlPath)
|
||||||
|
h.proxy.Logger.Info("maven metadata unavailable in primary upstream, trying Gradle Plugin Portal",
|
||||||
|
"path", urlPath)
|
||||||
|
body, contentType, err = h.proxy.FetchOrCacheMetadata(r.Context(), "maven", cacheKey, pluginPortalURL, "*/*")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrUpstreamNotFound) {
|
||||||
|
http.Error(w, "not found", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
h.proxy.Logger.Error("metadata fetch failed", "error", err)
|
||||||
|
http.Error(w, "failed to fetch from upstream", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.proxy.writeMetadataCachedResponse(w, r, "maven", cacheKey, body, contentType)
|
||||||
|
}
|
||||||
|
|
||||||
// handleDownload serves an artifact file, fetching and caching from upstream if needed.
|
// handleDownload serves an artifact file, fetching and caching from upstream if needed.
|
||||||
func (h *MavenHandler) handleDownload(w http.ResponseWriter, r *http.Request, urlPath string) {
|
func (h *MavenHandler) handleDownload(w http.ResponseWriter, r *http.Request, urlPath string) {
|
||||||
// Parse Maven path: group/artifact/version/filename
|
// Parse Maven path: group/artifact/version/filename
|
||||||
|
|
@ -86,6 +122,18 @@ func (h *MavenHandler) handleDownload(w http.ResponseWriter, r *http.Request, ur
|
||||||
|
|
||||||
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "maven", name, version, filename, upstreamURL)
|
result, err := h.proxy.GetOrFetchArtifactFromURL(r.Context(), "maven", name, version, filename, upstreamURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrUpstreamNotFound) {
|
||||||
|
pluginPortalURL := fmt.Sprintf("%s/%s", h.pluginPortalUpstreamURL, urlPath)
|
||||||
|
h.proxy.Logger.Info("maven artifact not found in primary upstream, trying Gradle Plugin Portal",
|
||||||
|
"group", group, "artifact", artifact, "version", version, "filename", filename)
|
||||||
|
result, err = h.proxy.GetOrFetchArtifactFromURL(r.Context(), "maven", name, version, filename, pluginPortalURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrUpstreamNotFound) {
|
||||||
|
http.Error(w, "not found", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
h.proxy.Logger.Error("failed to get artifact", "error", err)
|
h.proxy.Logger.Error("failed to get artifact", "error", err)
|
||||||
http.Error(w, "failed to fetch artifact", http.StatusBadGateway)
|
http.Error(w, "failed to fetch artifact", http.StatusBadGateway)
|
||||||
return
|
return
|
||||||
|
|
@ -115,7 +163,7 @@ func (h *MavenHandler) parsePath(urlPath string) (group, artifact, version, file
|
||||||
// isArtifactFile returns true if the filename looks like a Maven artifact.
|
// isArtifactFile returns true if the filename looks like a Maven artifact.
|
||||||
func (h *MavenHandler) isArtifactFile(filename string) bool {
|
func (h *MavenHandler) isArtifactFile(filename string) bool {
|
||||||
// Common artifact extensions
|
// Common artifact extensions
|
||||||
extensions := []string{".jar", ".war", ".ear", ".pom", ".aar", ".klib"}
|
extensions := []string{".jar", ".war", ".ear", ".pom", ".aar", ".klib", ".module"}
|
||||||
for _, ext := range extensions {
|
for _, ext := range extensions {
|
||||||
if strings.HasSuffix(filename, ext) {
|
if strings.HasSuffix(filename, ext) {
|
||||||
return true
|
return true
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ func TestMavenIsArtifactFile(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{"guava-32.1.3-jre.jar", true},
|
{"guava-32.1.3-jre.jar", true},
|
||||||
{"guava-32.1.3-jre.pom", true},
|
{"guava-32.1.3-jre.pom", true},
|
||||||
|
{"guava-32.1.3-jre.module", true},
|
||||||
{"app-1.0.war", true},
|
{"app-1.0.war", true},
|
||||||
{"lib-1.0.aar", true},
|
{"lib-1.0.aar", true},
|
||||||
{"maven-metadata.xml", false},
|
{"maven-metadata.xml", false},
|
||||||
|
|
@ -65,3 +66,63 @@ func TestMavenIsArtifactFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestMavenIsMetadataFile(t *testing.T) {
|
||||||
|
h := &MavenHandler{}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
filename string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "pom is artifact, not metadata",
|
||||||
|
filename: "com.diffplug.spotless.gradle.plugin-8.4.0.pom",
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "pom checksum is metadata",
|
||||||
|
filename: "com.diffplug.spotless.gradle.plugin-8.4.0.pom.sha1",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "metadata file",
|
||||||
|
filename: "maven-metadata.xml",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "metadata checksum",
|
||||||
|
filename: "maven-metadata.xml.sha256",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "jar checksum is metadata",
|
||||||
|
filename: "guava-32.1.3-jre.jar.sha1",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "asc signature is metadata",
|
||||||
|
filename: "guava-32.1.3-jre.jar.asc",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "regular jar is not metadata",
|
||||||
|
filename: "guava-32.1.3-jre.jar",
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "pom checksum is metadata",
|
||||||
|
filename: "guava-32.1.3-jre.pom.sha1",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got := h.isMetadataFile(tt.filename)
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf("isMetadataFile(%q) = %v, want %v", tt.filename, got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
const testVersion100 = "1.0.0"
|
const testVersion100 = "1.0.0"
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ func (h *NuGetHandler) handleRegistration(w http.ResponseWriter, r *http.Request
|
||||||
http.Error(w, "failed to create request", http.StatusInternalServerError)
|
http.Error(w, "failed to create request", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
req.Header.Set("Accept-Encoding", "gzip")
|
req.Header.Set(headerAcceptEncoding, "gzip")
|
||||||
|
|
||||||
resp, err := h.proxy.HTTPClient.Do(req)
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -193,7 +193,7 @@ func (h *NuGetHandler) handleRegistration(w http.ResponseWriter, r *http.Request
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
body, err := ReadMetadata(resp.Body)
|
body, err := h.proxy.ReadMetadata(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to read response", http.StatusInternalServerError)
|
http.Error(w, "failed to read response", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
|
|
@ -338,8 +338,8 @@ func (h *NuGetHandler) proxyUpstream(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy accept-encoding for compression
|
// Copy accept-encoding for compression
|
||||||
if ae := r.Header.Get("Accept-Encoding"); ae != "" {
|
if ae := r.Header.Get(headerAcceptEncoding); ae != "" {
|
||||||
req.Header.Set("Accept-Encoding", ae)
|
req.Header.Set(headerAcceptEncoding, ae)
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := h.proxy.HTTPClient.Do(req)
|
resp, err := h.proxy.HTTPClient.Do(req)
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func nugetTestProxy() *Proxy {
|
func nugetTestProxy() *Proxy {
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,15 @@ func TestContainsPathTraversal(t *testing.T) {
|
||||||
{"pool/main/../../../etc/shadow", true},
|
{"pool/main/../../../etc/shadow", true},
|
||||||
{"pool/..hidden/file", false}, // ".." as a segment, not "..hidden"
|
{"pool/..hidden/file", false}, // ".." as a segment, not "..hidden"
|
||||||
{"", false},
|
{"", false},
|
||||||
|
{"%2e%2e/etc/passwd", true},
|
||||||
|
{"%2e%2e%2fetc%2fpasswd", true},
|
||||||
|
{"pool/%2e%2e/%2e%2e/etc/shadow", true},
|
||||||
|
{"%2E%2E%2Fetc", true},
|
||||||
|
{`..\\etc\\passwd`, true},
|
||||||
|
{`pool\\..\\..\\etc`, true},
|
||||||
|
{"%2e%2e%5cetc%5cpasswd", true},
|
||||||
|
{"pool/%2e%2ehidden/file", false},
|
||||||
|
{"pool/%zz/bad-encoding", false},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestPubRewriteMetadata(t *testing.T) {
|
func TestPubRewriteMetadata(t *testing.T) {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
"github.com/git-pkgs/registries/fetch"
|
"github.com/git-pkgs/registries/fetch"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,12 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestReadMetadata(t *testing.T) {
|
func TestReadMetadata(t *testing.T) {
|
||||||
|
const limit = 1024
|
||||||
|
p := &Proxy{MetadataMaxSize: limit}
|
||||||
|
|
||||||
t.Run("small body", func(t *testing.T) {
|
t.Run("small body", func(t *testing.T) {
|
||||||
data := []byte("hello world")
|
data := []byte("hello world")
|
||||||
got, err := ReadMetadata(bytes.NewReader(data))
|
got, err := p.ReadMetadata(bytes.NewReader(data))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
|
|
@ -19,27 +22,39 @@ func TestReadMetadata(t *testing.T) {
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("exactly at limit", func(t *testing.T) {
|
t.Run("exactly at limit", func(t *testing.T) {
|
||||||
data := make([]byte, maxMetadataSize)
|
data := make([]byte, limit)
|
||||||
for i := range data {
|
for i := range data {
|
||||||
data[i] = 'x'
|
data[i] = 'x'
|
||||||
}
|
}
|
||||||
got, err := ReadMetadata(bytes.NewReader(data))
|
got, err := p.ReadMetadata(bytes.NewReader(data))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
if len(got) != int(maxMetadataSize) {
|
if len(got) != limit {
|
||||||
t.Errorf("got length %d, want %d", len(got), maxMetadataSize)
|
t.Errorf("got length %d, want %d", len(got), limit)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("over limit returns error", func(t *testing.T) {
|
t.Run("over limit returns error", func(t *testing.T) {
|
||||||
data := make([]byte, maxMetadataSize+100)
|
data := make([]byte, limit+100)
|
||||||
for i := range data {
|
for i := range data {
|
||||||
data[i] = 'x'
|
data[i] = 'x'
|
||||||
}
|
}
|
||||||
_, err := ReadMetadata(bytes.NewReader(data))
|
_, err := p.ReadMetadata(bytes.NewReader(data))
|
||||||
if !errors.Is(err, ErrMetadataTooLarge) {
|
if !errors.Is(err, ErrMetadataTooLarge) {
|
||||||
t.Errorf("got error %v, want ErrMetadataTooLarge", err)
|
t.Errorf("got error %v, want ErrMetadataTooLarge", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("zero limit uses default", func(t *testing.T) {
|
||||||
|
p := &Proxy{}
|
||||||
|
data := make([]byte, 1<<20)
|
||||||
|
got, err := p.ReadMetadata(bytes.NewReader(data))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != len(data) {
|
||||||
|
t.Errorf("got length %d, want %d", len(got), len(data))
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,22 @@ var (
|
||||||
Help: "Number of currently active requests",
|
Help: "Number of currently active requests",
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
IntegrityFailures = prometheus.NewCounterVec(
|
||||||
|
prometheus.CounterOpts{
|
||||||
|
Name: "proxy_integrity_failures_total",
|
||||||
|
Help: "Cached artifacts that failed hash verification on read",
|
||||||
|
},
|
||||||
|
[]string{"ecosystem"},
|
||||||
|
)
|
||||||
|
|
||||||
|
HealthProbeFailures = prometheus.NewCounterVec(
|
||||||
|
prometheus.CounterOpts{
|
||||||
|
Name: "proxy_health_probe_failures_total",
|
||||||
|
Help: "Total number of storage health probe failures, by step (write|size|read|verify|delete).",
|
||||||
|
},
|
||||||
|
[]string{"step"},
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
@ -138,6 +154,8 @@ func init() {
|
||||||
StorageOperationDuration,
|
StorageOperationDuration,
|
||||||
StorageErrors,
|
StorageErrors,
|
||||||
ActiveRequests,
|
ActiveRequests,
|
||||||
|
IntegrityFailures,
|
||||||
|
HealthProbeFailures,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,6 +196,17 @@ func RecordStorageOperation(operation string, duration time.Duration) {
|
||||||
StorageOperationDuration.WithLabelValues(operation).Observe(duration.Seconds())
|
StorageOperationDuration.WithLabelValues(operation).Observe(duration.Seconds())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RecordIntegrityFailure increments the integrity failure counter.
|
||||||
|
func RecordIntegrityFailure(ecosystem string) {
|
||||||
|
IntegrityFailures.WithLabelValues(ecosystem).Inc()
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecordHealthProbeFailure increments the health probe failure counter.
|
||||||
|
// step is one of: "write", "size", "read", "verify", "delete".
|
||||||
|
func RecordHealthProbeFailure(step string) {
|
||||||
|
HealthProbeFailures.WithLabelValues(step).Inc()
|
||||||
|
}
|
||||||
|
|
||||||
// RecordStorageError increments storage error counter.
|
// RecordStorageError increments storage error counter.
|
||||||
func RecordStorageError(operation string) {
|
func RecordStorageError(operation string) {
|
||||||
StorageErrors.WithLabelValues(operation).Inc()
|
StorageErrors.WithLabelValues(operation).Inc()
|
||||||
|
|
|
||||||
|
|
@ -140,10 +140,14 @@ type BulkResponse struct {
|
||||||
func (h *APIHandler) HandlePackagePath(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := chi.URLParam(r, "ecosystem")
|
ecosystem := chi.URLParam(r, "ecosystem")
|
||||||
wildcard := chi.URLParam(r, "*")
|
wildcard := chi.URLParam(r, "*")
|
||||||
|
if err := validatePackagePath(wildcard); err != nil {
|
||||||
|
badRequest(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
segments := splitWildcardPath(wildcard)
|
segments := splitWildcardPath(wildcard)
|
||||||
|
|
||||||
if ecosystem == "" || len(segments) == 0 {
|
if ecosystem == "" || len(segments) == 0 {
|
||||||
http.Error(w, "ecosystem and name are required", http.StatusBadRequest)
|
badRequest(w, "ecosystem and name are required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -190,12 +194,12 @@ func (h *APIHandler) HandlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
func (h *APIHandler) getPackage(w http.ResponseWriter, r *http.Request, ecosystem, name string) {
|
func (h *APIHandler) getPackage(w http.ResponseWriter, r *http.Request, ecosystem, name string) {
|
||||||
info, err := h.enrichment.EnrichPackage(r.Context(), ecosystem, name)
|
info, err := h.enrichment.EnrichPackage(r.Context(), ecosystem, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to enrich package", http.StatusInternalServerError)
|
writeError(w, http.StatusBadGateway, ErrCodeUpstream, "failed to enrich package")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if info == nil {
|
if info == nil {
|
||||||
http.Error(w, "package not found", http.StatusNotFound)
|
notFound(w, "package not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -217,7 +221,7 @@ func (h *APIHandler) getPackage(w http.ResponseWriter, r *http.Request, ecosyste
|
||||||
func (h *APIHandler) getVersion(w http.ResponseWriter, r *http.Request, ecosystem, name, version string) {
|
func (h *APIHandler) getVersion(w http.ResponseWriter, r *http.Request, ecosystem, name, version string) {
|
||||||
result, err := h.enrichment.EnrichFull(r.Context(), ecosystem, name, version)
|
result, err := h.enrichment.EnrichFull(r.Context(), ecosystem, name, version)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to enrich version", http.StatusInternalServerError)
|
writeError(w, http.StatusBadGateway, ErrCodeUpstream, "failed to enrich version")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -274,10 +278,14 @@ func (h *APIHandler) getVersion(w http.ResponseWriter, r *http.Request, ecosyste
|
||||||
func (h *APIHandler) HandleVulnsPath(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandleVulnsPath(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := chi.URLParam(r, "ecosystem")
|
ecosystem := chi.URLParam(r, "ecosystem")
|
||||||
wildcard := chi.URLParam(r, "*")
|
wildcard := chi.URLParam(r, "*")
|
||||||
|
if err := validatePackagePath(wildcard); err != nil {
|
||||||
|
badRequest(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
segments := splitWildcardPath(wildcard)
|
segments := splitWildcardPath(wildcard)
|
||||||
|
|
||||||
if ecosystem == "" || len(segments) == 0 {
|
if ecosystem == "" || len(segments) == 0 {
|
||||||
http.Error(w, "ecosystem and name are required", http.StatusBadRequest)
|
badRequest(w, "ecosystem and name are required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,7 +306,7 @@ func (h *APIHandler) HandleVulnsPath(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
vulns, err := h.enrichment.CheckVulnerabilities(r.Context(), ecosystem, name, version)
|
vulns, err := h.enrichment.CheckVulnerabilities(r.Context(), ecosystem, name, version)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to check vulnerabilities", http.StatusInternalServerError)
|
writeError(w, http.StatusBadGateway, ErrCodeUpstream, "failed to check vulnerabilities")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -330,19 +338,19 @@ func (h *APIHandler) HandleVulnsPath(w http.ResponseWriter, r *http.Request) {
|
||||||
// @Produce json
|
// @Produce json
|
||||||
// @Param request body OutdatedRequest true "Packages to check"
|
// @Param request body OutdatedRequest true "Packages to check"
|
||||||
// @Success 200 {object} OutdatedResponse
|
// @Success 200 {object} OutdatedResponse
|
||||||
// @Failure 400 {string} string
|
// @Failure 400 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/outdated [post]
|
// @Router /api/outdated [post]
|
||||||
func (h *APIHandler) HandleOutdated(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandleOutdated(w http.ResponseWriter, r *http.Request) {
|
||||||
r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
|
r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
|
||||||
var req OutdatedRequest
|
var req OutdatedRequest
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
badRequest(w, "invalid request body")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(req.Packages) == 0 {
|
if len(req.Packages) == 0 {
|
||||||
http.Error(w, "packages list is required", http.StatusBadRequest)
|
badRequest(w, "packages list is required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -376,19 +384,19 @@ func (h *APIHandler) HandleOutdated(w http.ResponseWriter, r *http.Request) {
|
||||||
// @Produce json
|
// @Produce json
|
||||||
// @Param request body BulkRequest true "PURLs"
|
// @Param request body BulkRequest true "PURLs"
|
||||||
// @Success 200 {object} BulkResponse
|
// @Success 200 {object} BulkResponse
|
||||||
// @Failure 400 {string} string
|
// @Failure 400 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/bulk [post]
|
// @Router /api/bulk [post]
|
||||||
func (h *APIHandler) HandleBulkLookup(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandleBulkLookup(w http.ResponseWriter, r *http.Request) {
|
||||||
r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
|
r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
|
||||||
var req BulkRequest
|
var req BulkRequest
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
badRequest(w, "invalid request body")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(req.PURLs) == 0 {
|
if len(req.PURLs) == 0 {
|
||||||
http.Error(w, "purls list is required", http.StatusBadRequest)
|
badRequest(w, "purls list is required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -476,15 +484,15 @@ type SearchPackageResult struct {
|
||||||
// @Param q query string true "Query"
|
// @Param q query string true "Query"
|
||||||
// @Param ecosystem query string false "Ecosystem"
|
// @Param ecosystem query string false "Ecosystem"
|
||||||
// @Success 200 {object} SearchResponse
|
// @Success 200 {object} SearchResponse
|
||||||
// @Failure 400 {string} string
|
// @Failure 400 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/search [get]
|
// @Router /api/search [get]
|
||||||
func (h *APIHandler) HandleSearch(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandleSearch(w http.ResponseWriter, r *http.Request) {
|
||||||
query := r.URL.Query().Get("q")
|
query := r.URL.Query().Get("q")
|
||||||
ecosystem := r.URL.Query().Get("ecosystem")
|
ecosystem := r.URL.Query().Get("ecosystem")
|
||||||
|
|
||||||
if query == "" {
|
if query == "" {
|
||||||
http.Error(w, "query parameter 'q' is required", http.StatusBadRequest)
|
badRequest(w, "query parameter 'q' is required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -494,7 +502,7 @@ func (h *APIHandler) HandleSearch(w http.ResponseWriter, r *http.Request) {
|
||||||
// Search in database
|
// Search in database
|
||||||
results, err := h.db.SearchPackages(query, ecosystem, limit, (page-1)*limit)
|
results, err := h.db.SearchPackages(query, ecosystem, limit, (page-1)*limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "search failed", http.StatusInternalServerError)
|
internalError(w, "search failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -538,7 +546,7 @@ func (h *APIHandler) HandleSearch(w http.ResponseWriter, r *http.Request) {
|
||||||
func writeJSON(w http.ResponseWriter, v any) {
|
func writeJSON(w http.ResponseWriter, v any) {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
if err := json.NewEncoder(w).Encode(v); err != nil {
|
if err := json.NewEncoder(w).Encode(v); err != nil {
|
||||||
http.Error(w, "failed to encode response", http.StatusInternalServerError)
|
internalError(w, "failed to encode response")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -573,8 +581,8 @@ type PackageListResult struct {
|
||||||
// @Param ecosystem query string false "Ecosystem"
|
// @Param ecosystem query string false "Ecosystem"
|
||||||
// @Param sort query string false "Sort" Enums(hits,name,size,cached_at,ecosystem,vulns)
|
// @Param sort query string false "Sort" Enums(hits,name,size,cached_at,ecosystem,vulns)
|
||||||
// @Success 200 {object} PackagesListResponse
|
// @Success 200 {object} PackagesListResponse
|
||||||
// @Failure 400 {string} string
|
// @Failure 400 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/packages [get]
|
// @Router /api/packages [get]
|
||||||
func (h *APIHandler) HandlePackagesList(w http.ResponseWriter, r *http.Request) {
|
func (h *APIHandler) HandlePackagesList(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := r.URL.Query().Get("ecosystem")
|
ecosystem := r.URL.Query().Get("ecosystem")
|
||||||
|
|
@ -592,7 +600,7 @@ func (h *APIHandler) HandlePackagesList(w http.ResponseWriter, r *http.Request)
|
||||||
"vulns": true,
|
"vulns": true,
|
||||||
}
|
}
|
||||||
if !validSorts[sortBy] {
|
if !validSorts[sortBy] {
|
||||||
http.Error(w, "invalid sort parameter", http.StatusBadRequest)
|
badRequest(w, "invalid sort parameter")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -601,7 +609,7 @@ func (h *APIHandler) HandlePackagesList(w http.ResponseWriter, r *http.Request)
|
||||||
|
|
||||||
packages, err := h.db.ListCachedPackages(ecosystem, sortBy, limit, (page-1)*limit)
|
packages, err := h.db.ListCachedPackages(ecosystem, sortBy, limit, (page-1)*limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to list packages", http.StatusInternalServerError)
|
internalError(w, "failed to list packages")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import (
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/database"
|
"github.com/git-pkgs/proxy/internal/database"
|
||||||
|
|
@ -48,6 +49,35 @@ func TestHandlePackagePath_MissingParams(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestHandlePackagePath_InvalidName(t *testing.T) {
|
||||||
|
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
||||||
|
svc := enrichment.New(logger)
|
||||||
|
h := NewAPIHandler(svc, nil)
|
||||||
|
|
||||||
|
r := chi.NewRouter()
|
||||||
|
r.Get("/api/package/{ecosystem}/*", h.HandlePackagePath)
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
path string
|
||||||
|
}{
|
||||||
|
{"null byte", "/api/package/npm/lodash%00"},
|
||||||
|
{"too long", "/api/package/npm/" + strings.Repeat("a", maxPackagePathLen+1)},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
req := httptest.NewRequest("GET", tt.path, nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
r.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("expected status 400, got %d", w.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestHandleVulnsPath_MissingParams(t *testing.T) {
|
func TestHandleVulnsPath_MissingParams(t *testing.T) {
|
||||||
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
||||||
svc := enrichment.New(logger)
|
svc := enrichment.New(logger)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
@ -18,6 +17,11 @@ import (
|
||||||
|
|
||||||
const contentTypePlainText = "text/plain; charset=utf-8"
|
const contentTypePlainText = "text/plain; charset=utf-8"
|
||||||
|
|
||||||
|
// maxBrowseArchiveSize caps how much data openArchive will buffer for
|
||||||
|
// prefix detection. Artifacts larger than this are rejected to prevent
|
||||||
|
// memory exhaustion from a single request.
|
||||||
|
const maxBrowseArchiveSize = 512 << 20 // 512 MB
|
||||||
|
|
||||||
// archiveFilename returns a filename suitable for archive format detection.
|
// archiveFilename returns a filename suitable for archive format detection.
|
||||||
// Some ecosystems (e.g. composer) store artifacts with bare hash filenames
|
// Some ecosystems (e.g. composer) store artifacts with bare hash filenames
|
||||||
// that have no extension. This adds .zip when the original has no extension
|
// that have no extension. This adds .zip when the original has no extension
|
||||||
|
|
@ -64,26 +68,27 @@ func detectSingleRootDir(reader archives.Reader) string {
|
||||||
func openArchive(filename string, content io.Reader, ecosystem string) (archives.Reader, error) { //nolint:ireturn // wraps multiple archive implementations
|
func openArchive(filename string, content io.Reader, ecosystem string) (archives.Reader, error) { //nolint:ireturn // wraps multiple archive implementations
|
||||||
fname := archiveFilename(filename)
|
fname := archiveFilename(filename)
|
||||||
|
|
||||||
// npm always uses package/ prefix
|
limited := io.LimitReader(content, maxBrowseArchiveSize+1)
|
||||||
if ecosystem == "npm" {
|
data, err := io.ReadAll(limited)
|
||||||
return archives.OpenWithPrefix(fname, content, "package/")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read content into memory so we can scan then wrap with prefix
|
|
||||||
data, err := io.ReadAll(content)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("reading artifact: %w", err)
|
return nil, fmt.Errorf("reading artifact: %w", err)
|
||||||
}
|
}
|
||||||
|
if int64(len(data)) > maxBrowseArchiveSize {
|
||||||
|
return nil, fmt.Errorf("artifact too large for browsing (%d bytes)", len(data))
|
||||||
|
}
|
||||||
|
|
||||||
// Open once to detect root prefix
|
if ecosystem == "npm" {
|
||||||
probe, err := archives.Open(fname, bytes.NewReader(data))
|
return archives.OpenBytesWithPrefix(fname, data, "package/")
|
||||||
|
}
|
||||||
|
|
||||||
|
probe, err := archives.OpenBytes(fname, data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
prefix := detectSingleRootDir(probe)
|
prefix := detectSingleRootDir(probe)
|
||||||
_ = probe.Close()
|
_ = probe.Close()
|
||||||
|
|
||||||
return archives.OpenWithPrefix(fname, bytes.NewReader(data), prefix)
|
return archives.OpenBytesWithPrefix(fname, data, prefix)
|
||||||
}
|
}
|
||||||
|
|
||||||
// BrowseListResponse contains the file listing for a directory in an archives.
|
// BrowseListResponse contains the file listing for a directory in an archives.
|
||||||
|
|
@ -112,9 +117,9 @@ type BrowseFileInfo struct {
|
||||||
// @Param version path string true "Version"
|
// @Param version path string true "Version"
|
||||||
// @Param path query string false "Directory path inside the archive"
|
// @Param path query string false "Directory path inside the archive"
|
||||||
// @Success 200 {object} BrowseListResponse
|
// @Success 200 {object} BrowseListResponse
|
||||||
// @Failure 404 {string} string
|
// @Failure 404 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/browse/{ecosystem}/{name}/{version} [get]
|
// @Router /ui/api/browse/{ecosystem}/{name}/{version} [get]
|
||||||
// handleBrowsePath dispatches /api/browse/{ecosystem}/* to the appropriate browse handler.
|
// handleBrowsePath dispatches /api/browse/{ecosystem}/* to the appropriate browse handler.
|
||||||
// It resolves namespaced package names by consulting the database.
|
// It resolves namespaced package names by consulting the database.
|
||||||
//
|
//
|
||||||
|
|
@ -125,10 +130,14 @@ type BrowseFileInfo struct {
|
||||||
func (s *Server) handleBrowsePath(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleBrowsePath(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := chi.URLParam(r, "ecosystem")
|
ecosystem := chi.URLParam(r, "ecosystem")
|
||||||
wildcard := chi.URLParam(r, "*")
|
wildcard := chi.URLParam(r, "*")
|
||||||
|
if err := validatePackagePath(wildcard); err != nil {
|
||||||
|
badRequest(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
segments := splitWildcardPath(wildcard)
|
segments := splitWildcardPath(wildcard)
|
||||||
|
|
||||||
if ecosystem == "" || len(segments) < 2 {
|
if ecosystem == "" || len(segments) < 2 {
|
||||||
http.Error(w, "ecosystem, name, and version required", http.StatusBadRequest)
|
badRequest(w, "ecosystem, name, and version required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,7 +161,7 @@ func (s *Server) handleBrowsePath(w http.ResponseWriter, r *http.Request) {
|
||||||
rest = nameVersionSegments[len(nameVersionSegments)-1:]
|
rest = nameVersionSegments[len(nameVersionSegments)-1:]
|
||||||
}
|
}
|
||||||
if len(rest) != 1 {
|
if len(rest) != 1 {
|
||||||
http.Error(w, "not found", http.StatusNotFound)
|
notFound(w, "not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.browseFile(w, r, ecosystem, name, rest[0], filePath)
|
s.browseFile(w, r, ecosystem, name, rest[0], filePath)
|
||||||
|
|
@ -166,7 +175,7 @@ func (s *Server) handleBrowsePath(w http.ResponseWriter, r *http.Request) {
|
||||||
rest = segments[len(segments)-1:]
|
rest = segments[len(segments)-1:]
|
||||||
}
|
}
|
||||||
if len(rest) != 1 {
|
if len(rest) != 1 {
|
||||||
http.Error(w, "not found", http.StatusNotFound)
|
notFound(w, "not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.browseList(w, r, ecosystem, name, rest[0])
|
s.browseList(w, r, ecosystem, name, rest[0])
|
||||||
|
|
@ -177,10 +186,14 @@ func (s *Server) handleBrowsePath(w http.ResponseWriter, r *http.Request) {
|
||||||
func (s *Server) handleComparePath(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleComparePath(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := chi.URLParam(r, "ecosystem")
|
ecosystem := chi.URLParam(r, "ecosystem")
|
||||||
wildcard := chi.URLParam(r, "*")
|
wildcard := chi.URLParam(r, "*")
|
||||||
|
if err := validatePackagePath(wildcard); err != nil {
|
||||||
|
badRequest(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
segments := splitWildcardPath(wildcard)
|
segments := splitWildcardPath(wildcard)
|
||||||
|
|
||||||
if ecosystem == "" || len(segments) < 3 {
|
if ecosystem == "" || len(segments) < 3 {
|
||||||
http.Error(w, "ecosystem, name, fromVersion, and toVersion required", http.StatusBadRequest)
|
badRequest(w, "ecosystem, name, fromVersion, and toVersion required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -200,12 +213,12 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
versionPURL := purl.MakePURLString(ecosystem, name, version)
|
versionPURL := purl.MakePURLString(ecosystem, name, version)
|
||||||
artifacts, err := s.db.GetArtifactsByVersionPURL(versionPURL)
|
artifacts, err := s.db.GetArtifactsByVersionPURL(versionPURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "version not found", http.StatusNotFound)
|
notFound(w, "version not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(artifacts) == 0 {
|
if len(artifacts) == 0 {
|
||||||
http.Error(w, "no artifacts cached", http.StatusNotFound)
|
notFound(w, "no artifacts cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -219,7 +232,7 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
}
|
}
|
||||||
|
|
||||||
if cachedArtifact == nil {
|
if cachedArtifact == nil {
|
||||||
http.Error(w, "artifact not cached", http.StatusNotFound)
|
notFound(w, "artifact not cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -227,7 +240,7 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
artifactReader, err := s.storage.Open(r.Context(), cachedArtifact.StoragePath.String)
|
artifactReader, err := s.storage.Open(r.Context(), cachedArtifact.StoragePath.String)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to read artifact from storage", "error", err)
|
s.logger.Error("failed to read artifact from storage", "error", err)
|
||||||
http.Error(w, "failed to read artifact", http.StatusInternalServerError)
|
internalError(w, "failed to read artifact")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = artifactReader.Close() }()
|
defer func() { _ = artifactReader.Close() }()
|
||||||
|
|
@ -236,7 +249,7 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
archiveReader, err := openArchive(cachedArtifact.Filename, artifactReader, ecosystem)
|
archiveReader, err := openArchive(cachedArtifact.Filename, artifactReader, ecosystem)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open archive", "error", err, "filename", cachedArtifact.Filename)
|
s.logger.Error("failed to open archive", "error", err, "filename", cachedArtifact.Filename)
|
||||||
http.Error(w, "failed to open archive", http.StatusInternalServerError)
|
internalError(w, "failed to open archive")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = archiveReader.Close() }()
|
defer func() { _ = archiveReader.Close() }()
|
||||||
|
|
@ -245,7 +258,7 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
files, err := archiveReader.ListDir(dirPath)
|
files, err := archiveReader.ListDir(dirPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to list directory", "error", err, "path", dirPath)
|
s.logger.Error("failed to list directory", "error", err, "path", dirPath)
|
||||||
http.Error(w, "failed to list directory", http.StatusInternalServerError)
|
internalError(w, "failed to list directory")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -280,13 +293,13 @@ func (s *Server) browseList(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
// @Param version path string true "Version"
|
// @Param version path string true "Version"
|
||||||
// @Param filepath path string true "File path inside the archive"
|
// @Param filepath path string true "File path inside the archive"
|
||||||
// @Success 200 {file} file
|
// @Success 200 {file} file
|
||||||
// @Failure 400 {string} string
|
// @Failure 400 {object} ErrorResponse
|
||||||
// @Failure 404 {string} string
|
// @Failure 404 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/browse/{ecosystem}/{name}/{version}/file/{filepath} [get]
|
// @Router /ui/api/browse/{ecosystem}/{name}/{version}/file/{filepath} [get]
|
||||||
func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, name, version, filePath string) {
|
func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, name, version, filePath string) {
|
||||||
if filePath == "" {
|
if filePath == "" {
|
||||||
http.Error(w, "file path required", http.StatusBadRequest)
|
badRequest(w, "file path required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -294,12 +307,12 @@ func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
versionPURL := purl.MakePURLString(ecosystem, name, version)
|
versionPURL := purl.MakePURLString(ecosystem, name, version)
|
||||||
artifacts, err := s.db.GetArtifactsByVersionPURL(versionPURL)
|
artifacts, err := s.db.GetArtifactsByVersionPURL(versionPURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "version not found", http.StatusNotFound)
|
notFound(w, "version not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(artifacts) == 0 {
|
if len(artifacts) == 0 {
|
||||||
http.Error(w, "no artifacts cached", http.StatusNotFound)
|
notFound(w, "no artifacts cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -313,7 +326,7 @@ func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
}
|
}
|
||||||
|
|
||||||
if cachedArtifact == nil {
|
if cachedArtifact == nil {
|
||||||
http.Error(w, "artifact not cached", http.StatusNotFound)
|
notFound(w, "artifact not cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -321,7 +334,7 @@ func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
artifactReader, err := s.storage.Open(r.Context(), cachedArtifact.StoragePath.String)
|
artifactReader, err := s.storage.Open(r.Context(), cachedArtifact.StoragePath.String)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to read artifact from storage", "error", err)
|
s.logger.Error("failed to read artifact from storage", "error", err)
|
||||||
http.Error(w, "failed to read artifact", http.StatusInternalServerError)
|
internalError(w, "failed to read artifact")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = artifactReader.Close() }()
|
defer func() { _ = artifactReader.Close() }()
|
||||||
|
|
@ -330,7 +343,7 @@ func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
archiveReader, err := openArchive(cachedArtifact.Filename, artifactReader, ecosystem)
|
archiveReader, err := openArchive(cachedArtifact.Filename, artifactReader, ecosystem)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open archive", "error", err, "filename", cachedArtifact.Filename)
|
s.logger.Error("failed to open archive", "error", err, "filename", cachedArtifact.Filename)
|
||||||
http.Error(w, "failed to open archive", http.StatusInternalServerError)
|
internalError(w, "failed to open archive")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = archiveReader.Close() }()
|
defer func() { _ = archiveReader.Close() }()
|
||||||
|
|
@ -339,20 +352,20 @@ func (s *Server) browseFile(w http.ResponseWriter, r *http.Request, ecosystem, n
|
||||||
fileReader, err := archiveReader.Extract(filePath)
|
fileReader, err := archiveReader.Extract(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "not found") {
|
if strings.Contains(err.Error(), "not found") {
|
||||||
http.Error(w, "file not found", http.StatusNotFound)
|
notFound(w, "file not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.logger.Error("failed to extract file", "error", err, "path", filePath)
|
s.logger.Error("failed to extract file", "error", err, "path", filePath)
|
||||||
http.Error(w, "failed to extract file", http.StatusInternalServerError)
|
internalError(w, "failed to extract file")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = fileReader.Close() }()
|
defer func() { _ = fileReader.Close() }()
|
||||||
|
|
||||||
// Set content type based on file extension
|
|
||||||
contentType := detectContentType(filePath)
|
contentType := detectContentType(filePath)
|
||||||
w.Header().Set("Content-Type", contentType)
|
w.Header().Set("Content-Type", contentType)
|
||||||
|
w.Header().Set("Content-Security-Policy", "sandbox")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
|
|
||||||
// Set filename for download
|
|
||||||
_, filename := path.Split(filePath)
|
_, filename := path.Split(filePath)
|
||||||
w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=%q", filename))
|
w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=%q", filename))
|
||||||
|
|
||||||
|
|
@ -368,8 +381,8 @@ func detectContentType(filename string) string {
|
||||||
// Text formats
|
// Text formats
|
||||||
case ".txt", ".md", ".markdown":
|
case ".txt", ".md", ".markdown":
|
||||||
return contentTypePlainText
|
return contentTypePlainText
|
||||||
case ".html", ".htm":
|
case ".html", ".htm", ".xhtml":
|
||||||
return "text/html; charset=utf-8"
|
return contentTypePlainText
|
||||||
case ".css":
|
case ".css":
|
||||||
return "text/css; charset=utf-8"
|
return "text/css; charset=utf-8"
|
||||||
case ".js", ".mjs":
|
case ".js", ".mjs":
|
||||||
|
|
@ -423,7 +436,7 @@ func detectContentType(filename string) string {
|
||||||
case ".gif":
|
case ".gif":
|
||||||
return "image/gif"
|
return "image/gif"
|
||||||
case ".svg":
|
case ".svg":
|
||||||
return "image/svg+xml"
|
return contentTypePlainText
|
||||||
case ".ico":
|
case ".ico":
|
||||||
return "image/x-icon"
|
return "image/x-icon"
|
||||||
|
|
||||||
|
|
@ -465,6 +478,7 @@ func isLikelyText(filename string) bool {
|
||||||
|
|
||||||
// BrowseSourceData contains data for the browse source page.
|
// BrowseSourceData contains data for the browse source page.
|
||||||
type BrowseSourceData struct {
|
type BrowseSourceData struct {
|
||||||
|
Layout
|
||||||
Ecosystem string
|
Ecosystem string
|
||||||
PackageName string
|
PackageName string
|
||||||
Version string
|
Version string
|
||||||
|
|
@ -483,9 +497,9 @@ type BrowseSourceData struct {
|
||||||
// @Param fromVersion path string true "From version"
|
// @Param fromVersion path string true "From version"
|
||||||
// @Param toVersion path string true "To version"
|
// @Param toVersion path string true "To version"
|
||||||
// @Success 200 {object} map[string]any
|
// @Success 200 {object} map[string]any
|
||||||
// @Failure 404 {string} string
|
// @Failure 404 {object} ErrorResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion} [get]
|
// @Router /ui/api/compare/{ecosystem}/{name}/{fromVersion}/{toVersion} [get]
|
||||||
func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem, name, fromVersion, toVersion string) {
|
func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem, name, fromVersion, toVersion string) {
|
||||||
// Get artifacts for both versions
|
// Get artifacts for both versions
|
||||||
fromPURL := purl.MakePURLString(ecosystem, name, fromVersion)
|
fromPURL := purl.MakePURLString(ecosystem, name, fromVersion)
|
||||||
|
|
@ -493,13 +507,13 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
|
|
||||||
fromArtifacts, err := s.db.GetArtifactsByVersionPURL(fromPURL)
|
fromArtifacts, err := s.db.GetArtifactsByVersionPURL(fromPURL)
|
||||||
if err != nil || len(fromArtifacts) == 0 {
|
if err != nil || len(fromArtifacts) == 0 {
|
||||||
http.Error(w, "from version not found or not cached", http.StatusNotFound)
|
notFound(w, "from version not found or not cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
toArtifacts, err := s.db.GetArtifactsByVersionPURL(toPURL)
|
toArtifacts, err := s.db.GetArtifactsByVersionPURL(toPURL)
|
||||||
if err != nil || len(toArtifacts) == 0 {
|
if err != nil || len(toArtifacts) == 0 {
|
||||||
http.Error(w, "to version not found or not cached", http.StatusNotFound)
|
notFound(w, "to version not found or not cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -519,7 +533,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
}
|
}
|
||||||
|
|
||||||
if fromArtifact == nil || toArtifact == nil {
|
if fromArtifact == nil || toArtifact == nil {
|
||||||
http.Error(w, "one or both versions not cached", http.StatusNotFound)
|
notFound(w, "one or both versions not cached")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -527,7 +541,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
fromReader, err := s.storage.Open(r.Context(), fromArtifact.StoragePath.String)
|
fromReader, err := s.storage.Open(r.Context(), fromArtifact.StoragePath.String)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open from artifact", "error", err)
|
s.logger.Error("failed to open from artifact", "error", err)
|
||||||
http.Error(w, "failed to read from version", http.StatusInternalServerError)
|
internalError(w, "failed to read from version")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = fromReader.Close() }()
|
defer func() { _ = fromReader.Close() }()
|
||||||
|
|
@ -535,7 +549,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
toReader, err := s.storage.Open(r.Context(), toArtifact.StoragePath.String)
|
toReader, err := s.storage.Open(r.Context(), toArtifact.StoragePath.String)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open to artifact", "error", err)
|
s.logger.Error("failed to open to artifact", "error", err)
|
||||||
http.Error(w, "failed to read to version", http.StatusInternalServerError)
|
internalError(w, "failed to read to version")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = toReader.Close() }()
|
defer func() { _ = toReader.Close() }()
|
||||||
|
|
@ -543,7 +557,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
fromArchive, err := openArchive(fromArtifact.Filename, fromReader, ecosystem)
|
fromArchive, err := openArchive(fromArtifact.Filename, fromReader, ecosystem)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open from archive", "error", err)
|
s.logger.Error("failed to open from archive", "error", err)
|
||||||
http.Error(w, "failed to open from archive", http.StatusInternalServerError)
|
internalError(w, "failed to open from archive")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = fromArchive.Close() }()
|
defer func() { _ = fromArchive.Close() }()
|
||||||
|
|
@ -551,7 +565,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
toArchive, err := openArchive(toArtifact.Filename, toReader, ecosystem)
|
toArchive, err := openArchive(toArtifact.Filename, toReader, ecosystem)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to open to archive", "error", err)
|
s.logger.Error("failed to open to archive", "error", err)
|
||||||
http.Error(w, "failed to open to archive", http.StatusInternalServerError)
|
internalError(w, "failed to open to archive")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { _ = toArchive.Close() }()
|
defer func() { _ = toArchive.Close() }()
|
||||||
|
|
@ -560,7 +574,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
result, err := diff.Compare(fromArchive, toArchive)
|
result, err := diff.Compare(fromArchive, toArchive)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to generate diff", "error", err)
|
s.logger.Error("failed to generate diff", "error", err)
|
||||||
http.Error(w, "failed to generate diff", http.StatusInternalServerError)
|
internalError(w, "failed to generate diff")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -570,6 +584,7 @@ func (s *Server) compareDiff(w http.ResponseWriter, r *http.Request, ecosystem,
|
||||||
|
|
||||||
// ComparePageData contains data for the version comparison page.
|
// ComparePageData contains data for the version comparison page.
|
||||||
type ComparePageData struct {
|
type ComparePageData struct {
|
||||||
|
Layout
|
||||||
Ecosystem string
|
Ecosystem string
|
||||||
PackageName string
|
PackageName string
|
||||||
FromVersion string
|
FromVersion string
|
||||||
|
|
|
||||||
57
internal/server/browse_bench_test.go
Normal file
57
internal/server/browse_bench_test.go
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func createBenchTarGz(prefix string, fileCount, fileSize int) []byte {
|
||||||
|
rnd := rand.New(rand.NewSource(1)) //nolint:gosec
|
||||||
|
buf := new(bytes.Buffer)
|
||||||
|
gw := gzip.NewWriter(buf)
|
||||||
|
tw := tar.NewWriter(gw)
|
||||||
|
|
||||||
|
payload := make([]byte, fileSize)
|
||||||
|
for i := range fileCount {
|
||||||
|
rnd.Read(payload)
|
||||||
|
_ = tw.WriteHeader(&tar.Header{
|
||||||
|
Name: fmt.Sprintf("%sfile%04d.dat", prefix, i),
|
||||||
|
Size: int64(fileSize),
|
||||||
|
Mode: 0644,
|
||||||
|
})
|
||||||
|
_, _ = tw.Write(payload)
|
||||||
|
}
|
||||||
|
_ = tw.Close()
|
||||||
|
_ = gw.Close()
|
||||||
|
return buf.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func BenchmarkOpenArchive(b *testing.B) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
ecosystem string
|
||||||
|
filename string
|
||||||
|
data []byte
|
||||||
|
}{
|
||||||
|
{"npm", "npm", "pkg.tgz", createBenchTarGz("package/", 64, 16*1024)},
|
||||||
|
{"go", "go", "v1.2.3.tar.gz", createBenchTarGz("repo-abc123/", 64, 16*1024)},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range cases {
|
||||||
|
b.Run(tc.name, func(b *testing.B) {
|
||||||
|
b.SetBytes(int64(len(tc.data)))
|
||||||
|
b.ReportAllocs()
|
||||||
|
for b.Loop() {
|
||||||
|
r, err := openArchive(tc.filename, bytes.NewReader(tc.data), tc.ecosystem)
|
||||||
|
if err != nil {
|
||||||
|
b.Fatal(err)
|
||||||
|
}
|
||||||
|
_ = r.Close()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -65,7 +65,7 @@ func TestHandleBrowseList(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test listing root directory
|
// Test listing root directory
|
||||||
req := httptest.NewRequest("GET", "/api/browse/npm/test-browse/1.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/api/browse/npm/test-browse/1.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -83,7 +83,7 @@ func TestHandleBrowseList(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test listing subdirectory
|
// Test listing subdirectory
|
||||||
req = httptest.NewRequest("GET", "/api/browse/npm/test-browse/1.0.0?path=lib", nil)
|
req = httptest.NewRequest("GET", "/ui/api/browse/npm/test-browse/1.0.0?path=lib", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -138,7 +138,7 @@ func TestHandleBrowseFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test fetching a file
|
// Test fetching a file
|
||||||
req := httptest.NewRequest("GET", "/api/browse/npm/test-browse/1.0.0/file/README.md", nil)
|
req := httptest.NewRequest("GET", "/ui/api/browse/npm/test-browse/1.0.0/file/README.md", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -158,7 +158,7 @@ func TestHandleBrowseFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test fetching non-existent file
|
// Test fetching non-existent file
|
||||||
req = httptest.NewRequest("GET", "/api/browse/npm/test-browse/1.0.0/file/nonexistent.txt", nil)
|
req = httptest.NewRequest("GET", "/ui/api/browse/npm/test-browse/1.0.0/file/nonexistent.txt", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -179,6 +179,10 @@ func TestDetectContentType(t *testing.T) {
|
||||||
{"file.go", "text/x-go; charset=utf-8"},
|
{"file.go", "text/x-go; charset=utf-8"},
|
||||||
{"file.py", "text/x-python; charset=utf-8"},
|
{"file.py", "text/x-python; charset=utf-8"},
|
||||||
{"file.rs", "text/x-rust; charset=utf-8"},
|
{"file.rs", "text/x-rust; charset=utf-8"},
|
||||||
|
{"file.html", contentTypePlainText},
|
||||||
|
{"file.htm", contentTypePlainText},
|
||||||
|
{"file.xhtml", contentTypePlainText},
|
||||||
|
{"file.svg", contentTypePlainText},
|
||||||
{"file.png", "image/png"},
|
{"file.png", "image/png"},
|
||||||
{"file.jpg", "image/jpeg"},
|
{"file.jpg", "image/jpeg"},
|
||||||
{"README", contentTypePlainText},
|
{"README", contentTypePlainText},
|
||||||
|
|
@ -198,6 +202,19 @@ func TestDetectContentType(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestOpenArchiveSizeLimit(t *testing.T) {
|
||||||
|
huge := bytes.Repeat([]byte("x"), int(maxBrowseArchiveSize)+1)
|
||||||
|
for _, eco := range []string{"npm", "go"} {
|
||||||
|
_, err := openArchive("test.tar.gz", bytes.NewReader(huge), eco)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("%s: expected error for oversized archive, got nil", eco)
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "too large") {
|
||||||
|
t.Fatalf("%s: expected 'too large' error, got: %v", eco, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestIsLikelyText(t *testing.T) {
|
func TestIsLikelyText(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
filename string
|
filename string
|
||||||
|
|
@ -297,7 +314,7 @@ func TestBrowseNonCachedArtifact(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to browse
|
// Try to browse
|
||||||
req := httptest.NewRequest("GET", "/api/browse/npm/not-cached/1.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/api/browse/npm/not-cached/1.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -351,7 +368,7 @@ func TestHandleBrowseSourcePage(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test the browse source page loads
|
// Test the browse source page loads
|
||||||
req := httptest.NewRequest("GET", "/package/npm/test-browse/1.0.0/browse", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/test-browse/1.0.0/browse", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -484,7 +501,7 @@ func TestHandleCompareDiff(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test the compare endpoint
|
// Test the compare endpoint
|
||||||
req := httptest.NewRequest("GET", "/api/compare/npm/test-compare/1.0.0/2.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/api/compare/npm/test-compare/1.0.0/2.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -555,7 +572,7 @@ func TestHandleComparePage(t *testing.T) {
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
// Test valid format with ... separator
|
// Test valid format with ... separator
|
||||||
req := httptest.NewRequest("GET", "/package/npm/test/compare/1.0.0...2.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/test/compare/1.0.0...2.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -574,7 +591,7 @@ func TestHandleComparePage(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test invalid format (missing separator)
|
// Test invalid format (missing separator)
|
||||||
req = httptest.NewRequest("GET", "/package/npm/test/compare/invalid", nil)
|
req = httptest.NewRequest("GET", "/ui/package/npm/test/compare/invalid", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -583,7 +600,7 @@ func TestHandleComparePage(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test with only one dot (should fail)
|
// Test with only one dot (should fail)
|
||||||
req = httptest.NewRequest("GET", "/package/npm/test/compare/1.0.0.2.0.0", nil)
|
req = httptest.NewRequest("GET", "/ui/package/npm/test/compare/1.0.0.2.0.0", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import (
|
||||||
|
|
||||||
// DashboardData contains data for rendering the dashboard.
|
// DashboardData contains data for rendering the dashboard.
|
||||||
type DashboardData struct {
|
type DashboardData struct {
|
||||||
|
Layout
|
||||||
Stats DashboardStats
|
Stats DashboardStats
|
||||||
EnrichmentStats EnrichmentStatsView
|
EnrichmentStats EnrichmentStatsView
|
||||||
RecentPackages []PackageInfo
|
RecentPackages []PackageInfo
|
||||||
|
|
@ -60,6 +61,7 @@ type RegistryConfig struct {
|
||||||
|
|
||||||
// PackageShowData contains data for rendering the package show page.
|
// PackageShowData contains data for rendering the package show page.
|
||||||
type PackageShowData struct {
|
type PackageShowData struct {
|
||||||
|
Layout
|
||||||
Package *database.Package
|
Package *database.Package
|
||||||
Versions []database.Version
|
Versions []database.Version
|
||||||
Vulnerabilities []database.Vulnerability
|
Vulnerabilities []database.Vulnerability
|
||||||
|
|
@ -68,6 +70,7 @@ type PackageShowData struct {
|
||||||
|
|
||||||
// VersionShowData contains data for rendering the version show page.
|
// VersionShowData contains data for rendering the version show page.
|
||||||
type VersionShowData struct {
|
type VersionShowData struct {
|
||||||
|
Layout
|
||||||
Package *database.Package
|
Package *database.Package
|
||||||
Version *database.Version
|
Version *database.Version
|
||||||
Artifacts []database.Artifact
|
Artifacts []database.Artifact
|
||||||
|
|
@ -79,6 +82,7 @@ type VersionShowData struct {
|
||||||
|
|
||||||
// SearchPageData contains data for rendering the search results page.
|
// SearchPageData contains data for rendering the search results page.
|
||||||
type SearchPageData struct {
|
type SearchPageData struct {
|
||||||
|
Layout
|
||||||
Query string
|
Query string
|
||||||
Ecosystem string
|
Ecosystem string
|
||||||
Results []SearchResultItem
|
Results []SearchResultItem
|
||||||
|
|
@ -104,6 +108,7 @@ type SearchResultItem struct {
|
||||||
|
|
||||||
// PackagesListPageData contains data for rendering the packages list page.
|
// PackagesListPageData contains data for rendering the packages list page.
|
||||||
type PackagesListPageData struct {
|
type PackagesListPageData struct {
|
||||||
|
Layout
|
||||||
Ecosystem string
|
Ecosystem string
|
||||||
SortBy string
|
SortBy string
|
||||||
Results []SearchResultItem
|
Results []SearchResultItem
|
||||||
|
|
@ -127,6 +132,7 @@ func supportedEcosystems() []string {
|
||||||
"gem",
|
"gem",
|
||||||
"golang",
|
"golang",
|
||||||
"hex",
|
"hex",
|
||||||
|
"julia",
|
||||||
"maven",
|
"maven",
|
||||||
"npm",
|
"npm",
|
||||||
"nuget",
|
"nuget",
|
||||||
|
|
@ -176,6 +182,8 @@ func ecosystemBadgeClasses(ecosystem string) string {
|
||||||
return base + " bg-green-100 text-green-700 dark:bg-green-900/50 dark:text-green-300"
|
return base + " bg-green-100 text-green-700 dark:bg-green-900/50 dark:text-green-300"
|
||||||
case "cran":
|
case "cran":
|
||||||
return base + " bg-slate-100 text-slate-700 dark:bg-slate-800 dark:text-slate-300"
|
return base + " bg-slate-100 text-slate-700 dark:bg-slate-800 dark:text-slate-300"
|
||||||
|
case "julia":
|
||||||
|
return base + " bg-emerald-100 text-emerald-700 dark:bg-emerald-900/50 dark:text-emerald-300"
|
||||||
case "oci":
|
case "oci":
|
||||||
return base + " bg-sky-100 text-sky-700 dark:bg-sky-900/50 dark:text-sky-300"
|
return base + " bg-sky-100 text-sky-700 dark:bg-sky-900/50 dark:text-sky-300"
|
||||||
case "deb":
|
case "deb":
|
||||||
|
|
@ -286,6 +294,20 @@ index-url = ` + baseURL + `/pypi/simple/</code></pre>`),
|
||||||
</mirror>
|
</mirror>
|
||||||
</mirrors>
|
</mirrors>
|
||||||
</settings></code></pre>`),
|
</settings></code></pre>`),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: "gradle",
|
||||||
|
Name: "Gradle Build Cache",
|
||||||
|
Language: "Java/Kotlin",
|
||||||
|
Endpoint: "/gradle/",
|
||||||
|
Instructions: template.HTML(`<p class="config-note">Configure Gradle to use the proxy for HttpBuildCache:</p>
|
||||||
|
<pre><code>// In settings.gradle(.kts)
|
||||||
|
buildCache {
|
||||||
|
remote<HttpBuildCache> {
|
||||||
|
url = uri("` + baseURL + `/gradle/")
|
||||||
|
push = true
|
||||||
|
}
|
||||||
|
}</code></pre>`),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ID: "nuget",
|
ID: "nuget",
|
||||||
|
|
@ -363,6 +385,17 @@ local({
|
||||||
r["CRAN"] <- "` + baseURL + `/cran"
|
r["CRAN"] <- "` + baseURL + `/cran"
|
||||||
options(repos = r)
|
options(repos = r)
|
||||||
})</code></pre>`),
|
})</code></pre>`),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: "julia",
|
||||||
|
Name: "Julia",
|
||||||
|
Language: "Julia",
|
||||||
|
Endpoint: "/julia/",
|
||||||
|
Instructions: template.HTML(`<p class="config-note">Set the Pkg server before starting Julia:</p>
|
||||||
|
<pre><code>export JULIA_PKG_SERVER=` + baseURL + `/julia</code></pre>
|
||||||
|
<p class="config-note">Or inside a running session:</p>
|
||||||
|
<pre><code>ENV["JULIA_PKG_SERVER"] = "` + baseURL + `/julia"
|
||||||
|
using Pkg; Pkg.update()</code></pre>`),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ID: "oci",
|
ID: "oci",
|
||||||
|
|
|
||||||
42
internal/server/errors.go
Normal file
42
internal/server/errors.go
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Error codes returned in API error responses. These are stable identifiers
|
||||||
|
// that clients can match on; the message text is for humans and may change.
|
||||||
|
const (
|
||||||
|
ErrCodeBadRequest = "BAD_REQUEST"
|
||||||
|
ErrCodeNotFound = "NOT_FOUND"
|
||||||
|
ErrCodeUpstream = "UPSTREAM_ERROR"
|
||||||
|
ErrCodeInternal = "INTERNAL_ERROR"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrorResponse is the JSON body returned for API errors.
|
||||||
|
type ErrorResponse struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeError sends a JSON error response with the given status, code and
|
||||||
|
// user-facing message. Internal error details should be logged separately
|
||||||
|
// by the caller, never passed as the message.
|
||||||
|
func writeError(w http.ResponseWriter, status int, code, message string) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
_ = json.NewEncoder(w).Encode(ErrorResponse{Code: code, Message: message})
|
||||||
|
}
|
||||||
|
|
||||||
|
func badRequest(w http.ResponseWriter, message string) {
|
||||||
|
writeError(w, http.StatusBadRequest, ErrCodeBadRequest, message)
|
||||||
|
}
|
||||||
|
|
||||||
|
func notFound(w http.ResponseWriter, message string) {
|
||||||
|
writeError(w, http.StatusNotFound, ErrCodeNotFound, message)
|
||||||
|
}
|
||||||
|
|
||||||
|
func internalError(w http.ResponseWriter, message string) {
|
||||||
|
writeError(w, http.StatusInternalServerError, ErrCodeInternal, message)
|
||||||
|
}
|
||||||
93
internal/server/errors_test.go
Normal file
93
internal/server/errors_test.go
Normal file
|
|
@ -0,0 +1,93 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWriteError(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
fn func(w http.ResponseWriter)
|
||||||
|
status int
|
||||||
|
code string
|
||||||
|
message string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "badRequest",
|
||||||
|
fn: func(w http.ResponseWriter) { badRequest(w, "missing field") },
|
||||||
|
status: http.StatusBadRequest,
|
||||||
|
code: ErrCodeBadRequest,
|
||||||
|
message: "missing field",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "notFound",
|
||||||
|
fn: func(w http.ResponseWriter) { notFound(w, "package not found") },
|
||||||
|
status: http.StatusNotFound,
|
||||||
|
code: ErrCodeNotFound,
|
||||||
|
message: "package not found",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "internalError",
|
||||||
|
fn: func(w http.ResponseWriter) { internalError(w, "boom") },
|
||||||
|
status: http.StatusInternalServerError,
|
||||||
|
code: ErrCodeInternal,
|
||||||
|
message: "boom",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "upstream",
|
||||||
|
fn: func(w http.ResponseWriter) {
|
||||||
|
writeError(w, http.StatusBadGateway, ErrCodeUpstream, "registry unreachable")
|
||||||
|
},
|
||||||
|
status: http.StatusBadGateway,
|
||||||
|
code: ErrCodeUpstream,
|
||||||
|
message: "registry unreachable",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
tt.fn(w)
|
||||||
|
|
||||||
|
if w.Code != tt.status {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, tt.status)
|
||||||
|
}
|
||||||
|
if ct := w.Header().Get("Content-Type"); ct != "application/json" {
|
||||||
|
t.Errorf("Content-Type = %q, want application/json", ct)
|
||||||
|
}
|
||||||
|
|
||||||
|
var resp ErrorResponse
|
||||||
|
if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
|
||||||
|
t.Fatalf("response body is not valid JSON: %v (body: %q)", err, w.Body.String())
|
||||||
|
}
|
||||||
|
if resp.Code != tt.code {
|
||||||
|
t.Errorf("code = %q, want %q", resp.Code, tt.code)
|
||||||
|
}
|
||||||
|
if resp.Message != tt.message {
|
||||||
|
t.Errorf("message = %q, want %q", resp.Message, tt.message)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAPIErrorResponseShape(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
badRequest(w, "x")
|
||||||
|
|
||||||
|
var raw map[string]any
|
||||||
|
if err := json.Unmarshal(w.Body.Bytes(), &raw); err != nil {
|
||||||
|
t.Fatalf("invalid JSON: %v", err)
|
||||||
|
}
|
||||||
|
if _, ok := raw["code"]; !ok {
|
||||||
|
t.Error("response missing 'code' field")
|
||||||
|
}
|
||||||
|
if _, ok := raw["message"]; !ok {
|
||||||
|
t.Error("response missing 'message' field")
|
||||||
|
}
|
||||||
|
if len(raw) != 2 {
|
||||||
|
t.Errorf("response has unexpected fields: %v", raw)
|
||||||
|
}
|
||||||
|
}
|
||||||
149
internal/server/gradle_cache_eviction.go
Normal file
149
internal/server/gradle_cache_eviction.go
Normal file
|
|
@ -0,0 +1,149 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
const gradleBuildCacheStoragePrefix = "_gradle/http-build-cache/"
|
||||||
|
|
||||||
|
type gradleBuildCacheLister interface {
|
||||||
|
ListPrefix(ctx context.Context, prefix string) ([]storage.ObjectInfo, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) startGradleBuildCacheEviction(ctx context.Context) {
|
||||||
|
maxAge := s.cfg.ParseGradleBuildCacheMaxAge()
|
||||||
|
maxSize := s.cfg.ParseGradleBuildCacheMaxSize()
|
||||||
|
if maxAge <= 0 && maxSize <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
lister, ok := s.storage.(gradleBuildCacheLister)
|
||||||
|
if !ok {
|
||||||
|
s.logger.Warn("gradle cache eviction is enabled, but storage backend cannot list objects")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
interval := s.cfg.ParseGradleBuildCacheSweepInterval()
|
||||||
|
s.logger.Info("gradle cache eviction enabled",
|
||||||
|
"max_age", maxAge,
|
||||||
|
"max_size_bytes", maxSize,
|
||||||
|
"interval", interval)
|
||||||
|
|
||||||
|
sweep := func() {
|
||||||
|
deletedCount, freedBytes, err := sweepGradleBuildCache(ctx, s.storage, lister, maxAge, maxSize, time.Now())
|
||||||
|
if err != nil {
|
||||||
|
s.logger.Warn("gradle cache eviction sweep failed", "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if deletedCount > 0 {
|
||||||
|
s.logger.Info("gradle cache eviction sweep completed",
|
||||||
|
"deleted_entries", deletedCount,
|
||||||
|
"freed_bytes", freedBytes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sweep()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-ticker.C:
|
||||||
|
sweep()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func sweepGradleBuildCache(
|
||||||
|
ctx context.Context,
|
||||||
|
store storage.Storage,
|
||||||
|
lister gradleBuildCacheLister,
|
||||||
|
maxAge time.Duration,
|
||||||
|
maxSize int64,
|
||||||
|
now time.Time,
|
||||||
|
) (int, int64, error) {
|
||||||
|
entries, err := lister.ListPrefix(ctx, gradleBuildCacheStoragePrefix)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("listing gradle cache entries: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(entries) == 0 {
|
||||||
|
return 0, 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
sortOldestFirst(entries)
|
||||||
|
|
||||||
|
deletedCount := 0
|
||||||
|
freedBytes := int64(0)
|
||||||
|
var firstDeleteErr error
|
||||||
|
|
||||||
|
deleteEntry := func(entry storage.ObjectInfo) bool {
|
||||||
|
if err := store.Delete(ctx, entry.Path); err != nil {
|
||||||
|
if firstDeleteErr == nil {
|
||||||
|
firstDeleteErr = err
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
deletedCount++
|
||||||
|
freedBytes += entry.Size
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
remaining := entries
|
||||||
|
if maxAge > 0 {
|
||||||
|
cutoff := now.Add(-maxAge)
|
||||||
|
kept := make([]storage.ObjectInfo, 0, len(entries))
|
||||||
|
|
||||||
|
for _, entry := range entries {
|
||||||
|
if !entry.ModTime.IsZero() && entry.ModTime.Before(cutoff) {
|
||||||
|
if deleteEntry(entry) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
kept = append(kept, entry)
|
||||||
|
}
|
||||||
|
|
||||||
|
remaining = kept
|
||||||
|
}
|
||||||
|
|
||||||
|
if maxSize > 0 {
|
||||||
|
totalSize := int64(0)
|
||||||
|
for _, entry := range remaining {
|
||||||
|
totalSize += entry.Size
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, entry := range remaining {
|
||||||
|
if totalSize <= maxSize {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if deleteEntry(entry) {
|
||||||
|
totalSize -= entry.Size
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if firstDeleteErr != nil {
|
||||||
|
return deletedCount, freedBytes, fmt.Errorf("deleting gradle cache entries: %w", firstDeleteErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
return deletedCount, freedBytes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func sortOldestFirst(entries []storage.ObjectInfo) {
|
||||||
|
sort.Slice(entries, func(i, j int) bool {
|
||||||
|
if entries[i].ModTime.Equal(entries[j].ModTime) {
|
||||||
|
return entries[i].Path < entries[j].Path
|
||||||
|
}
|
||||||
|
return entries[i].ModTime.Before(entries[j].ModTime)
|
||||||
|
})
|
||||||
|
}
|
||||||
138
internal/server/gradle_cache_eviction_test.go
Normal file
138
internal/server/gradle_cache_eviction_test.go
Normal file
|
|
@ -0,0 +1,138 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
type fakeGradleCacheStore struct {
|
||||||
|
objects map[string]storage.ObjectInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
func newFakeGradleCacheStore(objects []storage.ObjectInfo) *fakeGradleCacheStore {
|
||||||
|
m := make(map[string]storage.ObjectInfo, len(objects))
|
||||||
|
for _, obj := range objects {
|
||||||
|
m[obj.Path] = obj
|
||||||
|
}
|
||||||
|
return &fakeGradleCacheStore{objects: m}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Store(_ context.Context, path string, r io.Reader) (int64, string, error) {
|
||||||
|
data, _ := io.ReadAll(r)
|
||||||
|
s.objects[path] = storage.ObjectInfo{Path: path, Size: int64(len(data)), ModTime: time.Now()}
|
||||||
|
return int64(len(data)), "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Open(_ context.Context, path string) (io.ReadCloser, error) {
|
||||||
|
obj, ok := s.objects[path]
|
||||||
|
if !ok {
|
||||||
|
return nil, storage.ErrNotFound
|
||||||
|
}
|
||||||
|
return io.NopCloser(bytes.NewReader(make([]byte, obj.Size))), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Exists(_ context.Context, path string) (bool, error) {
|
||||||
|
_, ok := s.objects[path]
|
||||||
|
return ok, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Delete(_ context.Context, path string) error {
|
||||||
|
delete(s.objects, path)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Size(_ context.Context, path string) (int64, error) {
|
||||||
|
obj, ok := s.objects[path]
|
||||||
|
if !ok {
|
||||||
|
return 0, storage.ErrNotFound
|
||||||
|
}
|
||||||
|
return obj.Size, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) SignedURL(_ context.Context, _ string, _ time.Duration) (string, error) {
|
||||||
|
return "", storage.ErrSignedURLUnsupported
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) UsedSpace(_ context.Context) (int64, error) {
|
||||||
|
var total int64
|
||||||
|
for _, obj := range s.objects {
|
||||||
|
total += obj.Size
|
||||||
|
}
|
||||||
|
return total, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) URL() string { return "mem://" }
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) Close() error { return nil }
|
||||||
|
|
||||||
|
func (s *fakeGradleCacheStore) ListPrefix(_ context.Context, prefix string) ([]storage.ObjectInfo, error) {
|
||||||
|
objects := make([]storage.ObjectInfo, 0)
|
||||||
|
for _, obj := range s.objects {
|
||||||
|
if strings.HasPrefix(obj.Path, prefix) {
|
||||||
|
objects = append(objects, obj)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return objects, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSweepGradleBuildCache_MaxAge(t *testing.T) {
|
||||||
|
now := time.Date(2026, 4, 27, 12, 0, 0, 0, time.UTC)
|
||||||
|
store := newFakeGradleCacheStore([]storage.ObjectInfo{
|
||||||
|
{Path: "_gradle/http-build-cache/old", Size: 10, ModTime: now.Add(-48 * time.Hour)},
|
||||||
|
{Path: "_gradle/http-build-cache/new", Size: 10, ModTime: now.Add(-2 * time.Hour)},
|
||||||
|
})
|
||||||
|
|
||||||
|
deleted, freed, err := sweepGradleBuildCache(context.Background(), store, store, 24*time.Hour, 0, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("sweepGradleBuildCache() error = %v", err)
|
||||||
|
}
|
||||||
|
if deleted != 1 {
|
||||||
|
t.Fatalf("deleted entries = %d, want 1", deleted)
|
||||||
|
}
|
||||||
|
if freed != 10 {
|
||||||
|
t.Fatalf("freed bytes = %d, want 10", freed)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := store.objects["_gradle/http-build-cache/old"]; ok {
|
||||||
|
t.Fatal("old entry was not deleted")
|
||||||
|
}
|
||||||
|
if _, ok := store.objects["_gradle/http-build-cache/new"]; !ok {
|
||||||
|
t.Fatal("new entry should remain")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSweepGradleBuildCache_MaxSizeOldestFirst(t *testing.T) {
|
||||||
|
now := time.Date(2026, 4, 27, 12, 0, 0, 0, time.UTC)
|
||||||
|
store := newFakeGradleCacheStore([]storage.ObjectInfo{
|
||||||
|
{Path: "_gradle/http-build-cache/a", Size: 5, ModTime: now.Add(-3 * time.Hour)},
|
||||||
|
{Path: "_gradle/http-build-cache/b", Size: 5, ModTime: now.Add(-2 * time.Hour)},
|
||||||
|
{Path: "_gradle/http-build-cache/c", Size: 5, ModTime: now.Add(-1 * time.Hour)},
|
||||||
|
})
|
||||||
|
|
||||||
|
deleted, freed, err := sweepGradleBuildCache(context.Background(), store, store, 0, 10, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("sweepGradleBuildCache() error = %v", err)
|
||||||
|
}
|
||||||
|
if deleted != 1 {
|
||||||
|
t.Fatalf("deleted entries = %d, want 1", deleted)
|
||||||
|
}
|
||||||
|
if freed != 5 {
|
||||||
|
t.Fatalf("freed bytes = %d, want 5", freed)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := store.objects["_gradle/http-build-cache/a"]; ok {
|
||||||
|
t.Fatal("oldest entry was not deleted")
|
||||||
|
}
|
||||||
|
if _, ok := store.objects["_gradle/http-build-cache/b"]; !ok {
|
||||||
|
t.Fatal("middle entry should remain")
|
||||||
|
}
|
||||||
|
if _, ok := store.objects["_gradle/http-build-cache/c"]; !ok {
|
||||||
|
t.Fatal("newest entry should remain")
|
||||||
|
}
|
||||||
|
}
|
||||||
182
internal/server/health.go
Normal file
182
internal/server/health.go
Normal file
|
|
@ -0,0 +1,182 @@
|
||||||
|
// Package server implements the proxy HTTP server.
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"strconv"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/metrics"
|
||||||
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
probePathPrefix = ".healthcheck/"
|
||||||
|
probeMarker = "proxy-healthcheck:"
|
||||||
|
probeSuffixBytes = 8
|
||||||
|
defaultProbeTTL = 30 * time.Second
|
||||||
|
defaultProbeTimeout = 10 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// HealthResponse is the JSON payload returned by /health.
|
||||||
|
type HealthResponse struct {
|
||||||
|
Status string `json:"status"`
|
||||||
|
Checks map[string]HealthCheck `json:"checks"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HealthCheck reports the status of a single subsystem check.
|
||||||
|
type HealthCheck struct {
|
||||||
|
Status string `json:"status"`
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
Step string `json:"step,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// probeError tags a storage probe failure with the step that failed.
|
||||||
|
type probeError struct {
|
||||||
|
step string
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *probeError) Error() string { return e.step + ": " + e.err.Error() }
|
||||||
|
func (e *probeError) Unwrap() error { return e.err }
|
||||||
|
|
||||||
|
// storageProbe runs a write → size-check → read → verify → delete round-trip
|
||||||
|
// against the storage backend. Returns nil on success or a *probeError on failure.
|
||||||
|
func storageProbe(ctx context.Context, s storage.Storage) (err error) {
|
||||||
|
suffix, suffixErr := randomSuffix()
|
||||||
|
if suffixErr != nil {
|
||||||
|
return &probeError{step: "write", err: fmt.Errorf("generating random suffix: %w", suffixErr)}
|
||||||
|
}
|
||||||
|
path := probePathPrefix + strconv.FormatInt(time.Now().UnixNano(), 10) + "-" + suffix
|
||||||
|
payload := []byte(probeMarker + suffix)
|
||||||
|
|
||||||
|
// 1. Store
|
||||||
|
size, _, storeErr := s.Store(ctx, path, bytes.NewReader(payload))
|
||||||
|
if storeErr != nil {
|
||||||
|
return &probeError{step: "write", err: storeErr}
|
||||||
|
}
|
||||||
|
// After Store succeeds, always attempt to delete on the way out so probe
|
||||||
|
// objects don't accumulate when a later step (size/open/read/verify) fails.
|
||||||
|
// Delete is reported as the primary error only if no earlier failure
|
||||||
|
// already set one.
|
||||||
|
defer func() {
|
||||||
|
if delErr := s.Delete(ctx, path); delErr != nil && err == nil {
|
||||||
|
err = &probeError{step: "delete", err: delErr}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
// 2. Size check
|
||||||
|
if size != int64(len(payload)) {
|
||||||
|
return &probeError{step: "size", err: fmt.Errorf("wrote %d bytes, expected %d", size, len(payload))}
|
||||||
|
}
|
||||||
|
// 3. Open
|
||||||
|
rc, openErr := s.Open(ctx, path)
|
||||||
|
if openErr != nil {
|
||||||
|
return &probeError{step: "read", err: openErr}
|
||||||
|
}
|
||||||
|
// 4. Read all (classify mid-stream errors as read, not verify).
|
||||||
|
// Close explicitly (not deferred) so the file handle is released before
|
||||||
|
// Delete — on Windows, an open handle prevents deletion.
|
||||||
|
data, readErr := io.ReadAll(rc)
|
||||||
|
_ = rc.Close()
|
||||||
|
if readErr != nil {
|
||||||
|
return &probeError{step: "read", err: readErr}
|
||||||
|
}
|
||||||
|
// 5. Verify
|
||||||
|
if !bytes.Equal(data, payload) {
|
||||||
|
return &probeError{step: "verify", err: fmt.Errorf("content mismatch")}
|
||||||
|
}
|
||||||
|
// 6. Delete is handled via the deferred cleanup above.
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// randomSuffix returns 8 cryptographically random bytes hex-encoded.
|
||||||
|
func randomSuffix() (string, error) {
|
||||||
|
b := make([]byte, probeSuffixBytes)
|
||||||
|
if _, err := rand.Read(b); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(b), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// healthCache memoizes the result of storageProbe for a configurable TTL.
|
||||||
|
// It is safe for concurrent use.
|
||||||
|
type healthCache struct {
|
||||||
|
storage storage.Storage
|
||||||
|
interval time.Duration
|
||||||
|
probeTimeout time.Duration
|
||||||
|
logger *slog.Logger
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
lastAt time.Time
|
||||||
|
lastErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
// newHealthCache builds a cache, parsing the interval from a duration string.
|
||||||
|
// Empty interval string defaults to 30s. "0" or "0s" disables caching.
|
||||||
|
func newHealthCache(s storage.Storage, intervalStr string, logger *slog.Logger) (*healthCache, error) {
|
||||||
|
interval := defaultProbeTTL
|
||||||
|
if intervalStr != "" {
|
||||||
|
d, err := time.ParseDuration(intervalStr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("parsing storage_probe_interval %q: %w", intervalStr, err)
|
||||||
|
}
|
||||||
|
interval = d
|
||||||
|
}
|
||||||
|
return &healthCache{
|
||||||
|
storage: s,
|
||||||
|
interval: interval,
|
||||||
|
probeTimeout: defaultProbeTimeout,
|
||||||
|
logger: logger,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check returns the cached probe result if still fresh, otherwise runs a fresh probe.
|
||||||
|
// The probe runs under a context derived from context.Background() with a fixed
|
||||||
|
// timeout so that caller cancellation (e.g. client disconnect) cannot poison the
|
||||||
|
// cache with context.Canceled.
|
||||||
|
func (c *healthCache) Check() error {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
|
||||||
|
// Cache hit
|
||||||
|
if c.interval > 0 && !c.lastAt.IsZero() && time.Since(c.lastAt) < c.interval {
|
||||||
|
return c.lastErr
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fresh probe under a detached context
|
||||||
|
probeCtx, cancel := context.WithTimeout(context.Background(), c.probeTimeout)
|
||||||
|
defer cancel()
|
||||||
|
err := storageProbe(probeCtx, c.storage)
|
||||||
|
|
||||||
|
// Transition logging and metric increment happen only on the fresh-probe path.
|
||||||
|
c.logTransition(c.lastErr, err)
|
||||||
|
if err != nil {
|
||||||
|
var pe *probeError
|
||||||
|
if errors.As(err, &pe) {
|
||||||
|
metrics.RecordHealthProbeFailure(pe.step)
|
||||||
|
} else {
|
||||||
|
metrics.RecordHealthProbeFailure("unknown")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.lastErr = err
|
||||||
|
c.lastAt = time.Now()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *healthCache) logTransition(prev, curr error) {
|
||||||
|
switch {
|
||||||
|
case prev != nil && curr == nil:
|
||||||
|
c.logger.Info("storage probe recovered")
|
||||||
|
case prev == nil && curr != nil:
|
||||||
|
c.logger.Error("storage probe failed", "error", curr.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
448
internal/server/health_test.go
Normal file
448
internal/server/health_test.go
Normal file
|
|
@ -0,0 +1,448 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/git-pkgs/proxy/internal/metrics"
|
||||||
|
"github.com/git-pkgs/proxy/internal/storage"
|
||||||
|
"github.com/prometheus/client_golang/prometheus/testutil"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeStorage is a minimal storage.Storage for probe tests with per-step failure injection.
|
||||||
|
type fakeStorage struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
|
||||||
|
storeCalls atomic.Int64
|
||||||
|
openCalls atomic.Int64
|
||||||
|
closeCalls atomic.Int64
|
||||||
|
deleteCalls atomic.Int64
|
||||||
|
|
||||||
|
paths []string
|
||||||
|
payloads [][]byte
|
||||||
|
|
||||||
|
// Failure injection.
|
||||||
|
storeErr error
|
||||||
|
openErr error
|
||||||
|
readErr error // returned by the io.ReadCloser.Read after partial bytes
|
||||||
|
deleteErr error
|
||||||
|
|
||||||
|
// Misbehavior knobs.
|
||||||
|
sizeDelta int64 // added to the reported size from Store
|
||||||
|
readOverride []byte // if non-nil, Open returns a reader yielding these bytes instead of stored content
|
||||||
|
|
||||||
|
// storeBlock, if non-nil, causes Store to block until the channel is closed or ctx is done.
|
||||||
|
storeBlock chan struct{}
|
||||||
|
|
||||||
|
stored map[string][]byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func newFakeStorage() *fakeStorage { return &fakeStorage{stored: map[string][]byte{}} }
|
||||||
|
|
||||||
|
func (f *fakeStorage) Store(ctx context.Context, path string, r io.Reader) (int64, string, error) {
|
||||||
|
f.storeCalls.Add(1)
|
||||||
|
if f.storeErr != nil {
|
||||||
|
return 0, "", f.storeErr
|
||||||
|
}
|
||||||
|
if f.storeBlock != nil {
|
||||||
|
select {
|
||||||
|
case <-f.storeBlock:
|
||||||
|
case <-ctx.Done():
|
||||||
|
return 0, "", ctx.Err()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data, err := io.ReadAll(r)
|
||||||
|
if err != nil {
|
||||||
|
return 0, "", err
|
||||||
|
}
|
||||||
|
f.mu.Lock()
|
||||||
|
f.stored[path] = data
|
||||||
|
f.paths = append(f.paths, path)
|
||||||
|
f.payloads = append(f.payloads, data)
|
||||||
|
f.mu.Unlock()
|
||||||
|
return int64(len(data)) + f.sizeDelta, "fakehash", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type fakeReadCloser struct {
|
||||||
|
data []byte
|
||||||
|
pos int
|
||||||
|
readErr error
|
||||||
|
closed *atomic.Int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rc *fakeReadCloser) Read(p []byte) (int, error) {
|
||||||
|
if rc.pos >= len(rc.data) {
|
||||||
|
if rc.readErr != nil {
|
||||||
|
return 0, rc.readErr
|
||||||
|
}
|
||||||
|
return 0, io.EOF
|
||||||
|
}
|
||||||
|
n := copy(p, rc.data[rc.pos:])
|
||||||
|
rc.pos += n
|
||||||
|
if rc.pos >= len(rc.data) && rc.readErr != nil {
|
||||||
|
return n, rc.readErr
|
||||||
|
}
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rc *fakeReadCloser) Close() error { rc.closed.Add(1); return nil }
|
||||||
|
|
||||||
|
func (f *fakeStorage) Open(ctx context.Context, path string) (io.ReadCloser, error) {
|
||||||
|
f.openCalls.Add(1)
|
||||||
|
if f.openErr != nil {
|
||||||
|
return nil, f.openErr
|
||||||
|
}
|
||||||
|
f.mu.Lock()
|
||||||
|
data := f.stored[path]
|
||||||
|
f.mu.Unlock()
|
||||||
|
if f.readOverride != nil {
|
||||||
|
data = f.readOverride
|
||||||
|
}
|
||||||
|
return &fakeReadCloser{data: data, readErr: f.readErr, closed: &f.closeCalls}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeStorage) Exists(ctx context.Context, path string) (bool, error) {
|
||||||
|
f.mu.Lock()
|
||||||
|
defer f.mu.Unlock()
|
||||||
|
_, ok := f.stored[path]
|
||||||
|
return ok, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeStorage) Delete(ctx context.Context, path string) error {
|
||||||
|
f.deleteCalls.Add(1)
|
||||||
|
if f.deleteErr != nil {
|
||||||
|
return f.deleteErr
|
||||||
|
}
|
||||||
|
f.mu.Lock()
|
||||||
|
delete(f.stored, path)
|
||||||
|
f.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeStorage) Size(ctx context.Context, path string) (int64, error) { return 0, nil }
|
||||||
|
func (f *fakeStorage) SignedURL(ctx context.Context, path string, expiry time.Duration) (string, error) {
|
||||||
|
return "", storage.ErrSignedURLUnsupported
|
||||||
|
}
|
||||||
|
func (f *fakeStorage) UsedSpace(ctx context.Context) (int64, error) { return 0, nil }
|
||||||
|
func (f *fakeStorage) URL() string { return "fake://" }
|
||||||
|
func (f *fakeStorage) Close() error { return nil }
|
||||||
|
|
||||||
|
// --- Tests follow. First test: happy path ---
|
||||||
|
|
||||||
|
func TestStorageProbe_HappyPath(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
if err := storageProbe(context.Background(), fs); err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if got := fs.storeCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("Store calls = %d, want 1", got)
|
||||||
|
}
|
||||||
|
if got := fs.openCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("Open calls = %d, want 1", got)
|
||||||
|
}
|
||||||
|
if got := fs.closeCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("Close calls = %d, want 1", got)
|
||||||
|
}
|
||||||
|
if got := fs.deleteCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("Delete calls = %d, want 1", got)
|
||||||
|
}
|
||||||
|
if len(fs.paths) != 1 || !strings.HasPrefix(fs.paths[0], ".healthcheck/") {
|
||||||
|
t.Errorf("unexpected probe path: %v", fs.paths)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_WriteFails(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.storeErr = errors.New("disk full")
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) {
|
||||||
|
t.Fatalf("expected *probeError, got %T: %v", err, err)
|
||||||
|
}
|
||||||
|
if pe.step != "write" {
|
||||||
|
t.Errorf("step = %q, want write", pe.step)
|
||||||
|
}
|
||||||
|
if fs.openCalls.Load() != 0 {
|
||||||
|
t.Errorf("Open should not be called after write failure")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_SizeMismatch(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.sizeDelta = -1 // Report 1 byte fewer than actually written
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != "size" {
|
||||||
|
t.Fatalf("step = %v, want size; err = %v", pe, err)
|
||||||
|
}
|
||||||
|
if fs.openCalls.Load() != 0 {
|
||||||
|
t.Errorf("Open should not be called after size mismatch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_OpenFails(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.openErr = errors.New("access denied")
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != "read" {
|
||||||
|
t.Fatalf("step = %v, want read; err = %v", pe, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_ReadMidStreamFails(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.readErr = errors.New("connection reset")
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != "read" {
|
||||||
|
t.Fatalf("step = %v, want read (NOT verify); err = %v", pe, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_ContentMismatch(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.readOverride = []byte("wrong content")
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != "verify" {
|
||||||
|
t.Fatalf("step = %v, want verify; err = %v", pe, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_DeleteFails(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.deleteErr = errors.New("permission denied")
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != "delete" {
|
||||||
|
t.Fatalf("step = %v, want delete; err = %v", pe, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestStorageProbe_CleanupOnNonDeleteFailure asserts that the probe object is
|
||||||
|
// deleted even when a step after Store (size/open/read/verify) fails, so
|
||||||
|
// probe artifacts don't accumulate in the storage backend.
|
||||||
|
func TestStorageProbe_CleanupOnNonDeleteFailure(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
inject func(*fakeStorage)
|
||||||
|
wantErr string
|
||||||
|
}{
|
||||||
|
{"size mismatch", func(fs *fakeStorage) { fs.sizeDelta = -1 }, "size"},
|
||||||
|
{"open fails", func(fs *fakeStorage) { fs.openErr = errors.New("open boom") }, "read"},
|
||||||
|
{"read mid-stream", func(fs *fakeStorage) { fs.readErr = errors.New("mid-stream boom") }, "read"},
|
||||||
|
{"content mismatch", func(fs *fakeStorage) { fs.readOverride = []byte("wrong") }, "verify"},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
tc.inject(fs)
|
||||||
|
err := storageProbe(context.Background(), fs)
|
||||||
|
var pe *probeError
|
||||||
|
if !errors.As(err, &pe) || pe.step != tc.wantErr {
|
||||||
|
t.Fatalf("step = %v, want %q; err = %v", pe, tc.wantErr, err)
|
||||||
|
}
|
||||||
|
if got := fs.deleteCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("deleteCalls = %d, want 1 (cleanup should run on non-delete failures)", got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_ReaderClosedOnReadFailure(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.readErr = errors.New("read error")
|
||||||
|
_ = storageProbe(context.Background(), fs)
|
||||||
|
if got := fs.closeCalls.Load(); got != fs.openCalls.Load() {
|
||||||
|
t.Errorf("closeCalls = %d, openCalls = %d (should match)", got, fs.openCalls.Load())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStorageProbe_PathUniqueness(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
if err := storageProbe(context.Background(), fs); err != nil {
|
||||||
|
t.Fatalf("probe %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
seen := make(map[string]bool)
|
||||||
|
for _, p := range fs.paths {
|
||||||
|
if !strings.HasPrefix(p, ".healthcheck/") {
|
||||||
|
t.Errorf("path missing prefix: %q", p)
|
||||||
|
}
|
||||||
|
if seen[p] {
|
||||||
|
t.Errorf("duplicate path: %q", p)
|
||||||
|
}
|
||||||
|
seen[p] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// helper: a healthCache wired to a fakeStorage and a discard logger.
|
||||||
|
func newTestCache(fs *fakeStorage, interval time.Duration) *healthCache {
|
||||||
|
return &healthCache{
|
||||||
|
storage: fs,
|
||||||
|
interval: interval,
|
||||||
|
probeTimeout: 5 * time.Second,
|
||||||
|
logger: discardLogger(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func discardLogger() *slog.Logger {
|
||||||
|
return slog.New(slog.NewTextHandler(io.Discard, nil))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_CacheHit(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
c := newTestCache(fs, 30*time.Second)
|
||||||
|
if err := c.Check(); err != nil {
|
||||||
|
t.Fatalf("first check: %v", err)
|
||||||
|
}
|
||||||
|
if err := c.Check(); err != nil {
|
||||||
|
t.Fatalf("second check: %v", err)
|
||||||
|
}
|
||||||
|
if got := fs.storeCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("storeCalls = %d, want 1 (second call should be cached)", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_MissAfterTTL(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
c := newTestCache(fs, 10*time.Millisecond)
|
||||||
|
_ = c.Check()
|
||||||
|
time.Sleep(20 * time.Millisecond)
|
||||||
|
_ = c.Check()
|
||||||
|
if got := fs.storeCalls.Load(); got != 2 {
|
||||||
|
t.Errorf("storeCalls = %d, want 2", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_Disabled(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
c := newTestCache(fs, 0) // interval = 0 means probe every call
|
||||||
|
_ = c.Check()
|
||||||
|
_ = c.Check()
|
||||||
|
if got := fs.storeCalls.Load(); got != 2 {
|
||||||
|
t.Errorf("storeCalls = %d, want 2", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_LastAtNotAdvancedOnHit(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
c := newTestCache(fs, 30*time.Second)
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
_ = c.Check()
|
||||||
|
}
|
||||||
|
if got := fs.storeCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("storeCalls = %d, want 1 across 100 hits", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_ConcurrentSingleFlight(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
c := newTestCache(fs, 30*time.Second)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() { defer wg.Done(); _ = c.Check() }()
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
if got := fs.storeCalls.Load(); got != 1 {
|
||||||
|
t.Errorf("storeCalls = %d, want 1 with 20 concurrent callers", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_FailureCounterIncrement(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.storeErr = errors.New("boom")
|
||||||
|
c := newTestCache(fs, 30*time.Second)
|
||||||
|
|
||||||
|
before := testutil.ToFloat64(metrics.HealthProbeFailures.WithLabelValues("write"))
|
||||||
|
|
||||||
|
// First call: fresh probe → counter +1
|
||||||
|
_ = c.Check()
|
||||||
|
afterFirst := testutil.ToFloat64(metrics.HealthProbeFailures.WithLabelValues("write"))
|
||||||
|
if afterFirst-before != 1 {
|
||||||
|
t.Errorf("counter delta after first call = %v, want 1", afterFirst-before)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Second call: cache hit → counter NOT re-incremented
|
||||||
|
_ = c.Check()
|
||||||
|
afterSecond := testutil.ToFloat64(metrics.HealthProbeFailures.WithLabelValues("write"))
|
||||||
|
if afterSecond != afterFirst {
|
||||||
|
t.Errorf("counter changed on cache hit: %v → %v", afterFirst, afterSecond)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_ProbeTimeout(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
fs.storeBlock = make(chan struct{}) // Store will block until channel is closed (or never)
|
||||||
|
t.Cleanup(func() { close(fs.storeBlock) })
|
||||||
|
|
||||||
|
c := &healthCache{
|
||||||
|
storage: fs,
|
||||||
|
interval: 30 * time.Second,
|
||||||
|
probeTimeout: 50 * time.Millisecond,
|
||||||
|
logger: discardLogger(),
|
||||||
|
}
|
||||||
|
start := time.Now()
|
||||||
|
err := c.Check()
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected timeout error, got nil")
|
||||||
|
}
|
||||||
|
if elapsed > 500*time.Millisecond {
|
||||||
|
t.Errorf("probe took %v, expected ~50ms (timeout not respected)", elapsed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHealthCache_TransitionLogging(t *testing.T) {
|
||||||
|
fs := newFakeStorage()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
logger := slog.New(slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelInfo}))
|
||||||
|
c := &healthCache{
|
||||||
|
storage: fs,
|
||||||
|
interval: 0, // probe every call
|
||||||
|
probeTimeout: 5 * time.Second,
|
||||||
|
logger: logger,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Steady ok state — should not log
|
||||||
|
_ = c.Check()
|
||||||
|
_ = c.Check()
|
||||||
|
if got := strings.Count(buf.String(), "storage probe"); got != 0 {
|
||||||
|
t.Errorf("steady-state logs = %d, want 0; output: %s", got, buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ok → err transition: exactly one Error log
|
||||||
|
buf.Reset()
|
||||||
|
fs.storeErr = errors.New("boom")
|
||||||
|
_ = c.Check()
|
||||||
|
if !strings.Contains(buf.String(), "storage probe failed") {
|
||||||
|
t.Errorf("missing failure log on transition; output: %s", buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// err steady state — should not log again
|
||||||
|
buf.Reset()
|
||||||
|
_ = c.Check()
|
||||||
|
if buf.Len() != 0 {
|
||||||
|
t.Errorf("steady-err logs = %q, want empty", buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// err → ok transition: exactly one Info log
|
||||||
|
buf.Reset()
|
||||||
|
fs.storeErr = nil
|
||||||
|
_ = c.Check()
|
||||||
|
if !strings.Contains(buf.String(), "storage probe recovered") {
|
||||||
|
t.Errorf("missing recovery log on transition; output: %s", buf.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
19
internal/server/layout.go
Normal file
19
internal/server/layout.go
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import "net/http"
|
||||||
|
|
||||||
|
// Layout carries per-request fields consumed by the shared base template
|
||||||
|
// (canonical URL, og:url). It is embedded in every page data struct so that
|
||||||
|
// templates can reference {{.UIBaseURL}} and {{.CanonicalPath}} alongside the
|
||||||
|
// page's own fields.
|
||||||
|
type Layout struct {
|
||||||
|
UIBaseURL string
|
||||||
|
CanonicalPath string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) layoutFor(r *http.Request) Layout {
|
||||||
|
return Layout{
|
||||||
|
UIBaseURL: s.cfg.UIBaseURL,
|
||||||
|
CanonicalPath: r.URL.Path,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -20,19 +20,16 @@ func NewMirrorAPIHandler(jobs *mirror.JobStore) *MirrorAPIHandler {
|
||||||
|
|
||||||
// HandleCreate starts a new mirror job.
|
// HandleCreate starts a new mirror job.
|
||||||
func (h *MirrorAPIHandler) HandleCreate(w http.ResponseWriter, r *http.Request) {
|
func (h *MirrorAPIHandler) HandleCreate(w http.ResponseWriter, r *http.Request) {
|
||||||
|
r.Body = http.MaxBytesReader(w, r.Body, maxBodySize)
|
||||||
var req mirror.JobRequest
|
var req mirror.JobRequest
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
badRequest(w, "invalid request body")
|
||||||
w.WriteHeader(http.StatusBadRequest)
|
|
||||||
writeJSON(w, map[string]string{"error": "invalid request body"})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
id, err := h.jobs.Create(req)
|
id, err := h.jobs.Create(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
badRequest(w, "invalid mirror job request")
|
||||||
w.WriteHeader(http.StatusBadRequest)
|
|
||||||
writeJSON(w, map[string]string{"error": err.Error()})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -46,13 +43,10 @@ func (h *MirrorAPIHandler) HandleGet(w http.ResponseWriter, r *http.Request) {
|
||||||
id := chi.URLParam(r, "id")
|
id := chi.URLParam(r, "id")
|
||||||
job := h.jobs.Get(id)
|
job := h.jobs.Get(id)
|
||||||
if job == nil {
|
if job == nil {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
notFound(w, "job not found")
|
||||||
w.WriteHeader(http.StatusNotFound)
|
|
||||||
writeJSON(w, map[string]string{"error": "job not found"})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
writeJSON(w, job)
|
writeJSON(w, job)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -60,11 +54,8 @@ func (h *MirrorAPIHandler) HandleGet(w http.ResponseWriter, r *http.Request) {
|
||||||
func (h *MirrorAPIHandler) HandleCancel(w http.ResponseWriter, r *http.Request) {
|
func (h *MirrorAPIHandler) HandleCancel(w http.ResponseWriter, r *http.Request) {
|
||||||
id := chi.URLParam(r, "id")
|
id := chi.URLParam(r, "id")
|
||||||
if h.jobs.Cancel(id) {
|
if h.jobs.Cancel(id) {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
writeJSON(w, map[string]string{"status": "canceled"})
|
writeJSON(w, map[string]string{"status": "canceled"})
|
||||||
} else {
|
} else {
|
||||||
w.Header().Set("Content-Type", "application/json")
|
notFound(w, "job not found or not running")
|
||||||
w.WriteHeader(http.StatusNotFound)
|
|
||||||
writeJSON(w, map[string]string{"error": "job not found or not running"})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,19 @@ func TestMirrorAPICreateJob(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestMirrorAPICreateOversizedBody(t *testing.T) {
|
||||||
|
h := setupMirrorAPI(t)
|
||||||
|
|
||||||
|
body := bytes.Repeat([]byte("x"), int(maxBodySize)+1)
|
||||||
|
req := httptest.NewRequest("POST", "/api/mirror", bytes.NewReader(body))
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
h.HandleCreate(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestMirrorAPICreateInvalidBody(t *testing.T) {
|
func TestMirrorAPICreateInvalidBody(t *testing.T) {
|
||||||
h := setupMirrorAPI(t)
|
h := setupMirrorAPI(t)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,39 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/database"
|
"github.com/git-pkgs/proxy/internal/database"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// maxPackagePathLen bounds the wildcard portion of package routes (name plus
|
||||||
|
// version and any suffix). npm caps names at 214 and Maven coordinates can be
|
||||||
|
// longer, so 512 leaves room without admitting pathological inputs.
|
||||||
|
const maxPackagePathLen = 512
|
||||||
|
|
||||||
|
// validatePackagePath rejects wildcard package paths that cannot be valid in
|
||||||
|
// any supported ecosystem. It is a coarse filter applied before database or
|
||||||
|
// enrichment lookups; ecosystem-specific name rules are layered on top.
|
||||||
|
func validatePackagePath(path string) error {
|
||||||
|
if path == "" {
|
||||||
|
return fmt.Errorf("package name required")
|
||||||
|
}
|
||||||
|
if len(path) > maxPackagePathLen {
|
||||||
|
return fmt.Errorf("package path exceeds %d bytes", maxPackagePathLen)
|
||||||
|
}
|
||||||
|
for _, r := range path {
|
||||||
|
if r == 0 {
|
||||||
|
return fmt.Errorf("package path contains null byte")
|
||||||
|
}
|
||||||
|
if unicode.IsControl(r) {
|
||||||
|
return fmt.Errorf("package path contains control character %#U", r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// resolvePackageName determines the package name from a wildcard path by
|
// resolvePackageName determines the package name from a wildcard path by
|
||||||
// checking the database. This handles namespaced packages like Composer's
|
// checking the database. This handles namespaced packages like Composer's
|
||||||
// vendor/name format where the package name contains a slash.
|
// vendor/name format where the package name contains a slash.
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package server
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/git-pkgs/proxy/internal/database"
|
"github.com/git-pkgs/proxy/internal/database"
|
||||||
|
|
@ -118,3 +119,36 @@ func TestSplitWildcardPath(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestValidatePackagePath(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
path string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{"simple", "lodash", false},
|
||||||
|
{"with version", "lodash/4.17.21", false},
|
||||||
|
{"npm scoped", "@babel/core/7.0.0", false},
|
||||||
|
{"composer namespaced", "symfony/console/6.0.0", false},
|
||||||
|
{"maven coordinates", "org.apache.commons/commons-lang3/3.12.0", false},
|
||||||
|
{"unicode", "café/1.0.0", false},
|
||||||
|
{"empty", "", true},
|
||||||
|
{"null byte", "lodash\x00/4.17.21", true},
|
||||||
|
{"null byte suffix", "lodash\x00", true},
|
||||||
|
{"newline", "lodash\n4.17.21", true},
|
||||||
|
{"carriage return", "lodash\r", true},
|
||||||
|
{"escape", "lodash\x1b[31m", true},
|
||||||
|
{"delete", "lodash\x7f", true},
|
||||||
|
{"too long", strings.Repeat("a", maxPackagePathLen+1), true},
|
||||||
|
{"at limit", strings.Repeat("a", maxPackagePathLen), false},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
err := validatePackagePath(tt.path)
|
||||||
|
if (err != nil) != tt.wantErr {
|
||||||
|
t.Errorf("validatePackagePath(%q) error = %v, wantErr %v", tt.path, err, tt.wantErr)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,13 @@
|
||||||
// - /pub/* - pub.dev registry protocol
|
// - /pub/* - pub.dev registry protocol
|
||||||
// - /pypi/* - PyPI registry protocol
|
// - /pypi/* - PyPI registry protocol
|
||||||
// - /maven/* - Maven repository protocol
|
// - /maven/* - Maven repository protocol
|
||||||
|
// - /gradle/* - Gradle HttpBuildCache protocol
|
||||||
// - /nuget/* - NuGet V3 API protocol
|
// - /nuget/* - NuGet V3 API protocol
|
||||||
// - /composer/* - Composer/Packagist protocol
|
// - /composer/* - Composer/Packagist protocol
|
||||||
// - /conan/* - Conan C/C++ protocol
|
// - /conan/* - Conan C/C++ protocol
|
||||||
// - /conda/* - Conda/Anaconda protocol
|
// - /conda/* - Conda/Anaconda protocol
|
||||||
// - /cran/* - CRAN (R) protocol
|
// - /cran/* - CRAN (R) protocol
|
||||||
|
// - /julia/* - Julia Pkg server protocol
|
||||||
// - /v2/* - OCI/Docker container registry protocol
|
// - /v2/* - OCI/Docker container registry protocol
|
||||||
// - /debian/* - Debian/APT repository protocol
|
// - /debian/* - Debian/APT repository protocol
|
||||||
// - /rpm/* - RPM/Yum repository protocol
|
// - /rpm/* - RPM/Yum repository protocol
|
||||||
|
|
@ -22,8 +24,17 @@
|
||||||
// - /health - Health check endpoint
|
// - /health - Health check endpoint
|
||||||
// - /stats - Cache statistics (JSON)
|
// - /stats - Cache statistics (JSON)
|
||||||
// - /openapi.json - OpenAPI spec (JSON)
|
// - /openapi.json - OpenAPI spec (JSON)
|
||||||
// - /packages - List all cached packages (HTML)
|
// - /metrics - Prometheus metrics
|
||||||
// - /search - Search packages (HTML)
|
//
|
||||||
|
// Web UI (HTML), mounted under /ui so reverse proxies can gate it
|
||||||
|
// separately from the package endpoints:
|
||||||
|
// - /ui/ - Dashboard
|
||||||
|
// - /ui/install - Client configuration guide
|
||||||
|
// - /ui/packages - List all cached packages
|
||||||
|
// - /ui/search - Search packages
|
||||||
|
// - /ui/package/... - Package and version detail pages
|
||||||
|
// - /ui/api/browse/... - Archive browsing (used by the UI)
|
||||||
|
// - /ui/api/compare/... - Archive diffing (used by the UI)
|
||||||
//
|
//
|
||||||
// API endpoints for enrichment data:
|
// API endpoints for enrichment data:
|
||||||
// - GET /api/package/{ecosystem}/{name} - Package metadata
|
// - GET /api/package/{ecosystem}/{name} - Package metadata
|
||||||
|
|
@ -39,6 +50,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
@ -48,7 +60,7 @@ import (
|
||||||
|
|
||||||
swaggerdoc "github.com/git-pkgs/proxy/docs/swagger"
|
swaggerdoc "github.com/git-pkgs/proxy/docs/swagger"
|
||||||
"github.com/git-pkgs/proxy/internal/config"
|
"github.com/git-pkgs/proxy/internal/config"
|
||||||
"github.com/git-pkgs/proxy/internal/cooldown"
|
"github.com/git-pkgs/cooldown"
|
||||||
"github.com/git-pkgs/proxy/internal/database"
|
"github.com/git-pkgs/proxy/internal/database"
|
||||||
"github.com/git-pkgs/proxy/internal/enrichment"
|
"github.com/git-pkgs/proxy/internal/enrichment"
|
||||||
"github.com/git-pkgs/proxy/internal/handler"
|
"github.com/git-pkgs/proxy/internal/handler"
|
||||||
|
|
@ -79,6 +91,7 @@ type Server struct {
|
||||||
http *http.Server
|
http *http.Server
|
||||||
templates *Templates
|
templates *Templates
|
||||||
cancel context.CancelFunc
|
cancel context.CancelFunc
|
||||||
|
healthCache *healthCache
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new Server with the given configuration.
|
// New creates a new Server with the given configuration.
|
||||||
|
|
@ -124,12 +137,20 @@ func New(cfg *config.Config, logger *slog.Logger) (*Server, error) {
|
||||||
return nil, fmt.Errorf("verifying storage connectivity: %w", err)
|
return nil, fmt.Errorf("verifying storage connectivity: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hc, err := newHealthCache(store, cfg.Health.StorageProbeInterval, logger)
|
||||||
|
if err != nil {
|
||||||
|
_ = store.Close()
|
||||||
|
_ = db.Close()
|
||||||
|
return nil, fmt.Errorf("initializing health cache: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
return &Server{
|
return &Server{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
db: db,
|
db: db,
|
||||||
storage: store,
|
storage: store,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
templates: &Templates{},
|
templates: &Templates{},
|
||||||
|
healthCache: hc,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,6 +169,12 @@ func (s *Server) Start() error {
|
||||||
proxy.Cooldown = cd
|
proxy.Cooldown = cd
|
||||||
proxy.CacheMetadata = s.cfg.CacheMetadata
|
proxy.CacheMetadata = s.cfg.CacheMetadata
|
||||||
proxy.MetadataTTL = s.cfg.ParseMetadataTTL()
|
proxy.MetadataTTL = s.cfg.ParseMetadataTTL()
|
||||||
|
proxy.MetadataMaxSize = s.cfg.ParseMetadataMaxSize()
|
||||||
|
proxy.GradleReadOnly = s.cfg.Gradle.BuildCache.ReadOnly
|
||||||
|
proxy.GradleMaxUploadSize = s.cfg.ParseGradleBuildCacheMaxUploadSize()
|
||||||
|
proxy.DirectServe = s.cfg.Storage.DirectServe
|
||||||
|
proxy.DirectServeTTL = s.cfg.ParseDirectServeTTL()
|
||||||
|
proxy.DirectServeBaseURL = s.cfg.Storage.DirectServeBaseURL
|
||||||
|
|
||||||
// Create router with Chi
|
// Create router with Chi
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
|
|
@ -155,7 +182,6 @@ func (s *Server) Start() error {
|
||||||
// Add middleware
|
// Add middleware
|
||||||
r.Use(middleware.RequestID)
|
r.Use(middleware.RequestID)
|
||||||
r.Use(RequestIDMiddleware)
|
r.Use(RequestIDMiddleware)
|
||||||
r.Use(middleware.RealIP)
|
|
||||||
r.Use(s.LoggerMiddleware)
|
r.Use(s.LoggerMiddleware)
|
||||||
r.Use(middleware.Recoverer)
|
r.Use(middleware.Recoverer)
|
||||||
r.Use(func(next http.Handler) http.Handler {
|
r.Use(func(next http.Handler) http.Handler {
|
||||||
|
|
@ -176,12 +202,19 @@ func (s *Server) Start() error {
|
||||||
hexHandler := handler.NewHexHandler(proxy, s.cfg.BaseURL)
|
hexHandler := handler.NewHexHandler(proxy, s.cfg.BaseURL)
|
||||||
pubHandler := handler.NewPubHandler(proxy, s.cfg.BaseURL)
|
pubHandler := handler.NewPubHandler(proxy, s.cfg.BaseURL)
|
||||||
pypiHandler := handler.NewPyPIHandler(proxy, s.cfg.BaseURL)
|
pypiHandler := handler.NewPyPIHandler(proxy, s.cfg.BaseURL)
|
||||||
mavenHandler := handler.NewMavenHandler(proxy, s.cfg.BaseURL)
|
mavenHandler := handler.NewMavenHandler(
|
||||||
|
proxy,
|
||||||
|
s.cfg.BaseURL,
|
||||||
|
s.cfg.Upstream.Maven,
|
||||||
|
s.cfg.Upstream.GradlePluginPortal,
|
||||||
|
)
|
||||||
|
gradleHandler := handler.NewGradleBuildCacheHandler(proxy)
|
||||||
nugetHandler := handler.NewNuGetHandler(proxy, s.cfg.BaseURL)
|
nugetHandler := handler.NewNuGetHandler(proxy, s.cfg.BaseURL)
|
||||||
composerHandler := handler.NewComposerHandler(proxy, s.cfg.BaseURL)
|
composerHandler := handler.NewComposerHandler(proxy, s.cfg.BaseURL)
|
||||||
conanHandler := handler.NewConanHandler(proxy, s.cfg.BaseURL)
|
conanHandler := handler.NewConanHandler(proxy, s.cfg.BaseURL)
|
||||||
condaHandler := handler.NewCondaHandler(proxy, s.cfg.BaseURL)
|
condaHandler := handler.NewCondaHandler(proxy, s.cfg.BaseURL)
|
||||||
cranHandler := handler.NewCRANHandler(proxy, s.cfg.BaseURL)
|
cranHandler := handler.NewCRANHandler(proxy, s.cfg.BaseURL)
|
||||||
|
juliaHandler := handler.NewJuliaHandler(proxy, s.cfg.BaseURL)
|
||||||
containerHandler := handler.NewContainerHandler(proxy, s.cfg.BaseURL)
|
containerHandler := handler.NewContainerHandler(proxy, s.cfg.BaseURL)
|
||||||
debianHandler := handler.NewDebianHandler(proxy, s.cfg.BaseURL)
|
debianHandler := handler.NewDebianHandler(proxy, s.cfg.BaseURL)
|
||||||
rpmHandler := handler.NewRPMHandler(proxy, s.cfg.BaseURL)
|
rpmHandler := handler.NewRPMHandler(proxy, s.cfg.BaseURL)
|
||||||
|
|
@ -194,28 +227,40 @@ func (s *Server) Start() error {
|
||||||
r.Mount("/pub", http.StripPrefix("/pub", pubHandler.Routes()))
|
r.Mount("/pub", http.StripPrefix("/pub", pubHandler.Routes()))
|
||||||
r.Mount("/pypi", http.StripPrefix("/pypi", pypiHandler.Routes()))
|
r.Mount("/pypi", http.StripPrefix("/pypi", pypiHandler.Routes()))
|
||||||
r.Mount("/maven", http.StripPrefix("/maven", mavenHandler.Routes()))
|
r.Mount("/maven", http.StripPrefix("/maven", mavenHandler.Routes()))
|
||||||
|
r.Mount("/gradle", http.StripPrefix("/gradle", gradleHandler.Routes()))
|
||||||
r.Mount("/nuget", http.StripPrefix("/nuget", nugetHandler.Routes()))
|
r.Mount("/nuget", http.StripPrefix("/nuget", nugetHandler.Routes()))
|
||||||
r.Mount("/composer", http.StripPrefix("/composer", composerHandler.Routes()))
|
r.Mount("/composer", http.StripPrefix("/composer", composerHandler.Routes()))
|
||||||
r.Mount("/conan", http.StripPrefix("/conan", conanHandler.Routes()))
|
r.Mount("/conan", http.StripPrefix("/conan", conanHandler.Routes()))
|
||||||
r.Mount("/conda", http.StripPrefix("/conda", condaHandler.Routes()))
|
r.Mount("/conda", http.StripPrefix("/conda", condaHandler.Routes()))
|
||||||
r.Mount("/cran", http.StripPrefix("/cran", cranHandler.Routes()))
|
r.Mount("/cran", http.StripPrefix("/cran", cranHandler.Routes()))
|
||||||
|
r.Mount("/julia", http.StripPrefix("/julia", juliaHandler.Routes()))
|
||||||
r.Mount("/v2", http.StripPrefix("/v2", containerHandler.Routes()))
|
r.Mount("/v2", http.StripPrefix("/v2", containerHandler.Routes()))
|
||||||
r.Mount("/debian", http.StripPrefix("/debian", debianHandler.Routes()))
|
r.Mount("/debian", http.StripPrefix("/debian", debianHandler.Routes()))
|
||||||
r.Mount("/rpm", http.StripPrefix("/rpm", rpmHandler.Routes()))
|
r.Mount("/rpm", http.StripPrefix("/rpm", rpmHandler.Routes()))
|
||||||
|
|
||||||
// Health, stats, and static endpoints
|
// Health, stats, and metrics endpoints
|
||||||
r.Get("/health", s.handleHealth)
|
r.Get("/health", s.handleHealth)
|
||||||
r.Get("/stats", s.handleStats)
|
r.Get("/stats", s.handleStats)
|
||||||
r.Get("/openapi.json", s.handleOpenAPIJSON)
|
r.Get("/openapi.json", s.handleOpenAPIJSON)
|
||||||
r.Get("/metrics", func(w http.ResponseWriter, r *http.Request) {
|
r.Get("/metrics", func(w http.ResponseWriter, r *http.Request) {
|
||||||
metrics.Handler().ServeHTTP(w, r)
|
metrics.Handler().ServeHTTP(w, r)
|
||||||
})
|
})
|
||||||
r.Mount("/static", http.StripPrefix("/static/", staticHandler()))
|
|
||||||
r.Get("/", s.handleRoot)
|
// Web UI. Mounted under /ui so a reverse proxy can apply different
|
||||||
r.Get("/install", s.handleInstall)
|
// access rules to it than to the package endpoints above (#123).
|
||||||
r.Get("/search", s.handleSearch)
|
r.Route("/ui", func(ui chi.Router) {
|
||||||
r.Get("/packages", s.handlePackagesList)
|
ui.Mount("/static", http.StripPrefix("/ui/static/", staticHandler()))
|
||||||
r.Get("/package/{ecosystem}/*", s.handlePackagePath)
|
ui.Get("/", s.handleRoot)
|
||||||
|
ui.Get("/install", s.handleInstall)
|
||||||
|
ui.Get("/search", s.handleSearch)
|
||||||
|
ui.Get("/packages", s.handlePackagesList)
|
||||||
|
ui.Get("/package/{ecosystem}/*", s.handlePackagePath)
|
||||||
|
ui.Get("/api/browse/{ecosystem}/*", s.handleBrowsePath)
|
||||||
|
ui.Get("/api/compare/{ecosystem}/*", s.handleComparePath)
|
||||||
|
})
|
||||||
|
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Redirect(w, r, "/ui/", http.StatusFound)
|
||||||
|
})
|
||||||
|
|
||||||
// API endpoints for enrichment data
|
// API endpoints for enrichment data
|
||||||
enrichSvc := enrichment.New(s.logger)
|
enrichSvc := enrichment.New(s.logger)
|
||||||
|
|
@ -228,13 +273,10 @@ func (s *Server) Start() error {
|
||||||
r.Get("/api/search", apiHandler.HandleSearch)
|
r.Get("/api/search", apiHandler.HandleSearch)
|
||||||
r.Get("/api/packages", apiHandler.HandlePackagesList)
|
r.Get("/api/packages", apiHandler.HandlePackagesList)
|
||||||
|
|
||||||
// Archive browsing and comparison endpoints also use wildcard for namespaced packages
|
|
||||||
r.Get("/api/browse/{ecosystem}/*", s.handleBrowsePath)
|
|
||||||
r.Get("/api/compare/{ecosystem}/*", s.handleComparePath)
|
|
||||||
|
|
||||||
// Start background context (used by mirror jobs and cleanup)
|
// Start background context (used by mirror jobs and cleanup)
|
||||||
bgCtx, bgCancel := context.WithCancel(context.Background())
|
bgCtx, bgCancel := context.WithCancel(context.Background())
|
||||||
s.cancel = bgCancel
|
s.cancel = bgCancel
|
||||||
|
s.startGradleBuildCacheEviction(bgCtx)
|
||||||
|
|
||||||
// Mirror API endpoints (opt-in via mirror_api config or PROXY_MIRROR_API env)
|
// Mirror API endpoints (opt-in via mirror_api config or PROXY_MIRROR_API env)
|
||||||
if s.cfg.MirrorAPI {
|
if s.cfg.MirrorAPI {
|
||||||
|
|
@ -258,8 +300,9 @@ func (s *Server) Start() error {
|
||||||
s.logger.Info("starting server",
|
s.logger.Info("starting server",
|
||||||
"listen", s.cfg.Listen,
|
"listen", s.cfg.Listen,
|
||||||
"base_url", s.cfg.BaseURL,
|
"base_url", s.cfg.BaseURL,
|
||||||
|
"ui_url", s.cfg.UIBaseURL,
|
||||||
"storage", s.storage.URL(),
|
"storage", s.storage.URL(),
|
||||||
"database", s.cfg.Database.Path)
|
"database", s.cfg.Database.String())
|
||||||
go s.updateCacheStatsMetrics()
|
go s.updateCacheStatsMetrics()
|
||||||
go s.startEvictionLoop(bgCtx)
|
go s.startEvictionLoop(bgCtx)
|
||||||
|
|
||||||
|
|
@ -360,6 +403,7 @@ func (s *Server) handleRoot(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
// Build dashboard data
|
// Build dashboard data
|
||||||
data := DashboardData{
|
data := DashboardData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Stats: DashboardStats{
|
Stats: DashboardStats{
|
||||||
CachedArtifacts: stats.TotalArtifacts,
|
CachedArtifacts: stats.TotalArtifacts,
|
||||||
TotalSize: formatSize(stats.TotalSize),
|
TotalSize: formatSize(stats.TotalSize),
|
||||||
|
|
@ -446,8 +490,12 @@ func (s *Server) handleOpenAPIJSON(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
|
||||||
func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) {
|
||||||
data := struct {
|
data := struct {
|
||||||
|
Layout
|
||||||
|
BaseURL string
|
||||||
Registries []RegistryConfig
|
Registries []RegistryConfig
|
||||||
}{
|
}{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
|
BaseURL: s.cfg.BaseURL,
|
||||||
Registries: getRegistryConfigs(s.cfg.BaseURL),
|
Registries: getRegistryConfigs(s.cfg.BaseURL),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -461,7 +509,7 @@ func (s *Server) handleSearch(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := r.URL.Query().Get("ecosystem")
|
ecosystem := r.URL.Query().Get("ecosystem")
|
||||||
|
|
||||||
if query == "" {
|
if query == "" {
|
||||||
http.Redirect(w, r, "/", http.StatusSeeOther)
|
http.Redirect(w, r, "/ui/", http.StatusSeeOther)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -510,6 +558,7 @@ func (s *Server) handleSearch(w http.ResponseWriter, r *http.Request) {
|
||||||
totalPages := int((total + int64(limit) - 1) / int64(limit))
|
totalPages := int((total + int64(limit) - 1) / int64(limit))
|
||||||
|
|
||||||
data := SearchPageData{
|
data := SearchPageData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Query: query,
|
Query: query,
|
||||||
Ecosystem: ecosystem,
|
Ecosystem: ecosystem,
|
||||||
Results: items,
|
Results: items,
|
||||||
|
|
@ -585,6 +634,7 @@ func (s *Server) handlePackagesList(w http.ResponseWriter, r *http.Request) {
|
||||||
totalPages := int((total + int64(limit) - 1) / int64(limit))
|
totalPages := int((total + int64(limit) - 1) / int64(limit))
|
||||||
|
|
||||||
data := PackagesListPageData{
|
data := PackagesListPageData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Ecosystem: ecosystem,
|
Ecosystem: ecosystem,
|
||||||
SortBy: sortBy,
|
SortBy: sortBy,
|
||||||
Results: items,
|
Results: items,
|
||||||
|
|
@ -612,6 +662,10 @@ func (s *Server) handlePackagesList(w http.ResponseWriter, r *http.Request) {
|
||||||
func (s *Server) handlePackagePath(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
ecosystem := chi.URLParam(r, "ecosystem")
|
ecosystem := chi.URLParam(r, "ecosystem")
|
||||||
wildcard := chi.URLParam(r, "*")
|
wildcard := chi.URLParam(r, "*")
|
||||||
|
if err := validatePackagePath(wildcard); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
segments := splitWildcardPath(wildcard)
|
segments := splitWildcardPath(wildcard)
|
||||||
|
|
||||||
if ecosystem == "" || len(segments) == 0 {
|
if ecosystem == "" || len(segments) == 0 {
|
||||||
|
|
@ -624,7 +678,7 @@ func (s *Server) handlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
if seg == "compare" && i > 0 && i < len(segments)-1 {
|
if seg == "compare" && i > 0 && i < len(segments)-1 {
|
||||||
name := strings.Join(segments[:i], "/")
|
name := strings.Join(segments[:i], "/")
|
||||||
versions := strings.Join(segments[i+1:], "/")
|
versions := strings.Join(segments[i+1:], "/")
|
||||||
s.showComparePage(w, ecosystem, name, versions)
|
s.showComparePage(w, r, ecosystem, name, versions)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -644,7 +698,7 @@ func (s *Server) handlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
// segment is a version (if present) and everything else is the name.
|
// segment is a version (if present) and everything else is the name.
|
||||||
if len(segments) == 1 {
|
if len(segments) == 1 {
|
||||||
// Single segment, no DB match: try package show (will 404).
|
// Single segment, no DB match: try package show (will 404).
|
||||||
s.showPackage(w, ecosystem, segments[0])
|
s.showPackage(w, r, ecosystem, segments[0])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
name = strings.Join(segments[:len(segments)-1], "/")
|
name = strings.Join(segments[:len(segments)-1], "/")
|
||||||
|
|
@ -653,17 +707,17 @@ func (s *Server) handlePackagePath(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case len(rest) == 0 && !browse:
|
case len(rest) == 0 && !browse:
|
||||||
s.showPackage(w, ecosystem, name)
|
s.showPackage(w, r, ecosystem, name)
|
||||||
case len(rest) == 1 && browse:
|
case len(rest) == 1 && browse:
|
||||||
s.showBrowseSource(w, ecosystem, name, rest[0])
|
s.showBrowseSource(w, r, ecosystem, name, rest[0])
|
||||||
case len(rest) == 1:
|
case len(rest) == 1:
|
||||||
s.showVersion(w, ecosystem, name, rest[0])
|
s.showVersion(w, r, ecosystem, name, rest[0])
|
||||||
default:
|
default:
|
||||||
http.Error(w, "not found", http.StatusNotFound)
|
http.Error(w, "not found", http.StatusNotFound)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) showPackage(w http.ResponseWriter, ecosystem, name string) {
|
func (s *Server) showPackage(w http.ResponseWriter, r *http.Request, ecosystem, name string) {
|
||||||
pkg, err := s.db.GetPackageByEcosystemName(ecosystem, name)
|
pkg, err := s.db.GetPackageByEcosystemName(ecosystem, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("failed to get package", "error", err, "ecosystem", ecosystem, "name", name)
|
s.logger.Error("failed to get package", "error", err, "ecosystem", ecosystem, "name", name)
|
||||||
|
|
@ -688,6 +742,7 @@ func (s *Server) showPackage(w http.ResponseWriter, ecosystem, name string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
data := PackageShowData{
|
data := PackageShowData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Package: pkg,
|
Package: pkg,
|
||||||
Versions: versions,
|
Versions: versions,
|
||||||
Vulnerabilities: vulns,
|
Vulnerabilities: vulns,
|
||||||
|
|
@ -699,7 +754,7 @@ func (s *Server) showPackage(w http.ResponseWriter, ecosystem, name string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) showVersion(w http.ResponseWriter, ecosystem, name, version string) {
|
func (s *Server) showVersion(w http.ResponseWriter, r *http.Request, ecosystem, name, version string) {
|
||||||
pkg, err := s.db.GetPackageByEcosystemName(ecosystem, name)
|
pkg, err := s.db.GetPackageByEcosystemName(ecosystem, name)
|
||||||
if err != nil || pkg == nil {
|
if err != nil || pkg == nil {
|
||||||
s.logger.Error("failed to get package", "error", err)
|
s.logger.Error("failed to get package", "error", err)
|
||||||
|
|
@ -738,6 +793,7 @@ func (s *Server) showVersion(w http.ResponseWriter, ecosystem, name, version str
|
||||||
}
|
}
|
||||||
|
|
||||||
data := VersionShowData{
|
data := VersionShowData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Package: pkg,
|
Package: pkg,
|
||||||
Version: ver,
|
Version: ver,
|
||||||
Artifacts: artifacts,
|
Artifacts: artifacts,
|
||||||
|
|
@ -752,8 +808,9 @@ func (s *Server) showVersion(w http.ResponseWriter, ecosystem, name, version str
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) showBrowseSource(w http.ResponseWriter, ecosystem, name, version string) {
|
func (s *Server) showBrowseSource(w http.ResponseWriter, r *http.Request, ecosystem, name, version string) {
|
||||||
data := BrowseSourceData{
|
data := BrowseSourceData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Ecosystem: ecosystem,
|
Ecosystem: ecosystem,
|
||||||
PackageName: name,
|
PackageName: name,
|
||||||
Version: version,
|
Version: version,
|
||||||
|
|
@ -765,7 +822,7 @@ func (s *Server) showBrowseSource(w http.ResponseWriter, ecosystem, name, versio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) showComparePage(w http.ResponseWriter, ecosystem, name, versions string) {
|
func (s *Server) showComparePage(w http.ResponseWriter, r *http.Request, ecosystem, name, versions string) {
|
||||||
const compareVersionParts = 2
|
const compareVersionParts = 2
|
||||||
parts := strings.Split(versions, "...")
|
parts := strings.Split(versions, "...")
|
||||||
if len(parts) != compareVersionParts {
|
if len(parts) != compareVersionParts {
|
||||||
|
|
@ -774,6 +831,7 @@ func (s *Server) showComparePage(w http.ResponseWriter, ecosystem, name, version
|
||||||
}
|
}
|
||||||
|
|
||||||
data := ComparePageData{
|
data := ComparePageData{
|
||||||
|
Layout: s.layoutFor(r),
|
||||||
Ecosystem: ecosystem,
|
Ecosystem: ecosystem,
|
||||||
PackageName: name,
|
PackageName: name,
|
||||||
FromVersion: parts[0],
|
FromVersion: parts[0],
|
||||||
|
|
@ -786,23 +844,49 @@ func (s *Server) showComparePage(w http.ResponseWriter, ecosystem, name, version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleHealth responds with a simple health check.
|
// handleHealth responds with a structured JSON health report.
|
||||||
|
//
|
||||||
// @Summary Health check
|
// @Summary Health check
|
||||||
// @Tags meta
|
// @Tags meta
|
||||||
// @Produce plain
|
// @Produce json
|
||||||
// @Success 200 {string} string
|
// @Success 200 {object} HealthResponse
|
||||||
// @Failure 503 {string} string
|
// @Failure 503 {object} HealthResponse
|
||||||
// @Router /health [get]
|
// @Router /health [get]
|
||||||
func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
|
||||||
// Check database connectivity
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
resp := HealthResponse{Status: "ok", Checks: map[string]HealthCheck{}}
|
||||||
|
|
||||||
|
// Database check (short-circuit; do not waste a storage probe call when DB is down).
|
||||||
|
// On DB failure the storage entry reports "skipped" rather than being omitted so
|
||||||
|
// the response always carries the same key set for monitors that expect it.
|
||||||
if _, err := s.db.SchemaVersion(); err != nil {
|
if _, err := s.db.SchemaVersion(); err != nil {
|
||||||
|
resp.Status = "error"
|
||||||
|
resp.Checks["database"] = HealthCheck{Status: "error", Error: err.Error()}
|
||||||
|
resp.Checks["storage"] = HealthCheck{Status: "skipped"}
|
||||||
w.WriteHeader(http.StatusServiceUnavailable)
|
w.WriteHeader(http.StatusServiceUnavailable)
|
||||||
_, _ = fmt.Fprint(w, "database error")
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
resp.Checks["database"] = HealthCheck{Status: "ok"}
|
||||||
|
|
||||||
|
// Storage probe (via cache).
|
||||||
|
if err := s.healthCache.Check(); err != nil {
|
||||||
|
resp.Status = "error"
|
||||||
|
sc := HealthCheck{Status: "error", Error: err.Error()}
|
||||||
|
var pe *probeError
|
||||||
|
if errors.As(err, &pe) {
|
||||||
|
sc.Step = pe.step
|
||||||
|
}
|
||||||
|
resp.Checks["storage"] = sc
|
||||||
|
w.WriteHeader(http.StatusServiceUnavailable)
|
||||||
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resp.Checks["storage"] = HealthCheck{Status: "ok"}
|
||||||
|
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
_, _ = fmt.Fprint(w, "ok")
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
// StatsResponse contains cache statistics.
|
// StatsResponse contains cache statistics.
|
||||||
|
|
@ -819,20 +903,20 @@ type StatsResponse struct {
|
||||||
// @Tags meta
|
// @Tags meta
|
||||||
// @Produce json
|
// @Produce json
|
||||||
// @Success 200 {object} StatsResponse
|
// @Success 200 {object} StatsResponse
|
||||||
// @Failure 500 {string} string
|
// @Failure 500 {object} ErrorResponse
|
||||||
// @Router /stats [get]
|
// @Router /stats [get]
|
||||||
func (s *Server) handleStats(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleStats(w http.ResponseWriter, r *http.Request) {
|
||||||
ctx := r.Context()
|
ctx := r.Context()
|
||||||
|
|
||||||
count, err := s.db.GetCachedArtifactCount()
|
count, err := s.db.GetCachedArtifactCount()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to get artifact count", http.StatusInternalServerError)
|
internalError(w, "failed to get artifact count")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
size, err := s.db.GetTotalCacheSize()
|
size, err := s.db.GetTotalCacheSize()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "failed to get cache size", http.StatusInternalServerError)
|
internalError(w, "failed to get cache size")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -843,7 +927,7 @@ func (s *Server) handleStats(w http.ResponseWriter, r *http.Request) {
|
||||||
TotalSize: size,
|
TotalSize: size,
|
||||||
TotalSizeHuman: formatSize(size),
|
TotalSizeHuman: formatSize(size),
|
||||||
StorageURL: s.storage.URL(),
|
StorageURL: s.storage.URL(),
|
||||||
DatabasePath: s.cfg.Database.Path,
|
DatabasePath: s.cfg.Database.String(),
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
|
||||||
|
|
@ -72,12 +72,21 @@ func newTestServer(t *testing.T) *testServer {
|
||||||
gemHandler := handler.NewGemHandler(proxy, cfg.BaseURL)
|
gemHandler := handler.NewGemHandler(proxy, cfg.BaseURL)
|
||||||
goHandler := handler.NewGoHandler(proxy, cfg.BaseURL)
|
goHandler := handler.NewGoHandler(proxy, cfg.BaseURL)
|
||||||
pypiHandler := handler.NewPyPIHandler(proxy, cfg.BaseURL)
|
pypiHandler := handler.NewPyPIHandler(proxy, cfg.BaseURL)
|
||||||
|
gradleHandler := handler.NewGradleBuildCacheHandler(proxy)
|
||||||
|
|
||||||
r.Mount("/npm", http.StripPrefix("/npm", npmHandler.Routes()))
|
r.Mount("/npm", http.StripPrefix("/npm", npmHandler.Routes()))
|
||||||
r.Mount("/cargo", http.StripPrefix("/cargo", cargoHandler.Routes()))
|
r.Mount("/cargo", http.StripPrefix("/cargo", cargoHandler.Routes()))
|
||||||
r.Mount("/gem", http.StripPrefix("/gem", gemHandler.Routes()))
|
r.Mount("/gem", http.StripPrefix("/gem", gemHandler.Routes()))
|
||||||
r.Mount("/go", http.StripPrefix("/go", goHandler.Routes()))
|
r.Mount("/go", http.StripPrefix("/go", goHandler.Routes()))
|
||||||
r.Mount("/pypi", http.StripPrefix("/pypi", pypiHandler.Routes()))
|
r.Mount("/pypi", http.StripPrefix("/pypi", pypiHandler.Routes()))
|
||||||
|
r.Mount("/gradle", http.StripPrefix("/gradle", gradleHandler.Routes()))
|
||||||
|
|
||||||
|
hc, err := newHealthCache(store, "30s", logger)
|
||||||
|
if err != nil {
|
||||||
|
_ = db.Close()
|
||||||
|
_ = os.RemoveAll(tempDir)
|
||||||
|
t.Fatalf("failed to create health cache: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
// Create a minimal server struct for the handlers
|
// Create a minimal server struct for the handlers
|
||||||
s := &Server{
|
s := &Server{
|
||||||
|
|
@ -86,19 +95,25 @@ func newTestServer(t *testing.T) *testServer {
|
||||||
storage: store,
|
storage: store,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
templates: &Templates{},
|
templates: &Templates{},
|
||||||
|
healthCache: hc,
|
||||||
}
|
}
|
||||||
|
|
||||||
r.Get("/health", s.handleHealth)
|
r.Get("/health", s.handleHealth)
|
||||||
r.Get("/stats", s.handleStats)
|
r.Get("/stats", s.handleStats)
|
||||||
r.Get("/openapi.json", s.handleOpenAPIJSON)
|
r.Get("/openapi.json", s.handleOpenAPIJSON)
|
||||||
r.Mount("/static", http.StripPrefix("/static/", staticHandler()))
|
r.Route("/ui", func(ui chi.Router) {
|
||||||
r.Get("/search", s.handleSearch)
|
ui.Mount("/static", http.StripPrefix("/ui/static/", staticHandler()))
|
||||||
r.Get("/package/{ecosystem}/*", s.handlePackagePath)
|
ui.Get("/", s.handleRoot)
|
||||||
r.Get("/api/browse/{ecosystem}/*", s.handleBrowsePath)
|
ui.Get("/install", s.handleInstall)
|
||||||
r.Get("/api/compare/{ecosystem}/*", s.handleComparePath)
|
ui.Get("/search", s.handleSearch)
|
||||||
r.Get("/", s.handleRoot)
|
ui.Get("/packages", s.handlePackagesList)
|
||||||
r.Get("/install", s.handleInstall)
|
ui.Get("/package/{ecosystem}/*", s.handlePackagePath)
|
||||||
r.Get("/packages", s.handlePackagesList)
|
ui.Get("/api/browse/{ecosystem}/*", s.handleBrowsePath)
|
||||||
|
ui.Get("/api/compare/{ecosystem}/*", s.handleComparePath)
|
||||||
|
})
|
||||||
|
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Redirect(w, r, "/ui/", http.StatusFound)
|
||||||
|
})
|
||||||
|
|
||||||
return &testServer{
|
return &testServer{
|
||||||
handler: r,
|
handler: r,
|
||||||
|
|
@ -177,12 +192,55 @@ func TestHealthEndpoint(t *testing.T) {
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Errorf("expected status 200, got %d", w.Code)
|
t.Fatalf("status = %d, want 200; body: %s", w.Code, w.Body.String())
|
||||||
|
}
|
||||||
|
if got := w.Header().Get("Content-Type"); got != "application/json" {
|
||||||
|
t.Errorf("Content-Type = %q, want application/json", got)
|
||||||
|
}
|
||||||
|
var resp HealthResponse
|
||||||
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
||||||
|
t.Fatalf("decoding response: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Status != "ok" {
|
||||||
|
t.Errorf("status = %q, want ok", resp.Status)
|
||||||
|
}
|
||||||
|
if resp.Checks["database"].Status != "ok" {
|
||||||
|
t.Errorf("database check = %+v, want ok", resp.Checks["database"])
|
||||||
|
}
|
||||||
|
if resp.Checks["storage"].Status != "ok" {
|
||||||
|
t.Errorf("storage check = %+v, want ok", resp.Checks["storage"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
body := w.Body.String()
|
func TestHealthEndpoint_DBFailureShortCircuits(t *testing.T) {
|
||||||
if body != "ok" {
|
ts := newTestServer(t)
|
||||||
t.Errorf("expected body 'ok', got %q", body)
|
defer ts.close()
|
||||||
|
|
||||||
|
// Force DB failure by closing the connection.
|
||||||
|
_ = ts.db.Close()
|
||||||
|
|
||||||
|
req := httptest.NewRequest("GET", "/health", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Fatalf("status = %d, want 503; body: %s", w.Code, w.Body.String())
|
||||||
|
}
|
||||||
|
var resp HealthResponse
|
||||||
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
||||||
|
t.Fatalf("decoding: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Status != "error" {
|
||||||
|
t.Errorf("status = %q, want error", resp.Status)
|
||||||
|
}
|
||||||
|
if resp.Checks["database"].Status != "error" {
|
||||||
|
t.Errorf("database check = %+v, want error", resp.Checks["database"])
|
||||||
|
}
|
||||||
|
storage, present := resp.Checks["storage"]
|
||||||
|
if !present {
|
||||||
|
t.Error("storage key should be present (with status=skipped) on DB short-circuit")
|
||||||
|
} else if storage.Status != "skipped" {
|
||||||
|
t.Errorf("storage check = %+v, want status=skipped", storage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -221,7 +279,7 @@ func TestDashboard(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/", nil)
|
req := httptest.NewRequest("GET", "/ui/", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -344,6 +402,33 @@ func TestPyPISimple(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGradleBuildCachePutGet(t *testing.T) {
|
||||||
|
ts := newTestServer(t)
|
||||||
|
defer ts.close()
|
||||||
|
|
||||||
|
key := "abc123def456"
|
||||||
|
body := "build-cache-bytes"
|
||||||
|
|
||||||
|
putReq := httptest.NewRequest(http.MethodPut, "/gradle/"+key, strings.NewReader(body))
|
||||||
|
putW := httptest.NewRecorder()
|
||||||
|
ts.handler.ServeHTTP(putW, putReq)
|
||||||
|
|
||||||
|
if putW.Code != http.StatusCreated {
|
||||||
|
t.Fatalf("expected status 201, got %d: %s", putW.Code, putW.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
getReq := httptest.NewRequest(http.MethodGet, "/gradle/"+key, nil)
|
||||||
|
getW := httptest.NewRecorder()
|
||||||
|
ts.handler.ServeHTTP(getW, getReq)
|
||||||
|
|
||||||
|
if getW.Code != http.StatusOK {
|
||||||
|
t.Fatalf("expected status 200, got %d: %s", getW.Code, getW.Body.String())
|
||||||
|
}
|
||||||
|
if got := getW.Body.String(); got != body {
|
||||||
|
t.Fatalf("expected body %q, got %q", body, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestGemSpecs(t *testing.T) {
|
func TestGemSpecs(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
@ -365,8 +450,9 @@ func TestStaticFiles(t *testing.T) {
|
||||||
path string
|
path string
|
||||||
contentTypes []string
|
contentTypes []string
|
||||||
}{
|
}{
|
||||||
{"/static/tailwind.js", []string{"text/javascript", "application/javascript"}},
|
{"/ui/static/vendor/tailwind.js", []string{"text/javascript", "application/javascript"}},
|
||||||
{"/static/style.css", []string{"text/css"}},
|
{"/ui/static/vendor/lucide.min.js", []string{"text/javascript", "application/javascript"}},
|
||||||
|
{"/ui/static/style.css", []string{"text/css"}},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
|
|
@ -417,7 +503,7 @@ func TestCategorizeLicenseCSS(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDashboardWithEnrichmentStats(t *testing.T) {
|
func TestRootRedirectsToUI(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
|
|
@ -425,6 +511,22 @@ func TestDashboardWithEnrichmentStats(t *testing.T) {
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusFound {
|
||||||
|
t.Errorf("expected status 302, got %d", w.Code)
|
||||||
|
}
|
||||||
|
if loc := w.Header().Get("Location"); loc != "/ui/" {
|
||||||
|
t.Errorf("expected redirect to /ui/, got %q", loc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDashboardWithEnrichmentStats(t *testing.T) {
|
||||||
|
ts := newTestServer(t)
|
||||||
|
defer ts.close()
|
||||||
|
|
||||||
|
req := httptest.NewRequest("GET", "/ui/", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Errorf("expected status 200, got %d", w.Code)
|
t.Errorf("expected status 200, got %d", w.Code)
|
||||||
}
|
}
|
||||||
|
|
@ -432,7 +534,7 @@ func TestDashboardWithEnrichmentStats(t *testing.T) {
|
||||||
body := w.Body.String()
|
body := w.Body.String()
|
||||||
|
|
||||||
// Dashboard should link to Tailwind JS
|
// Dashboard should link to Tailwind JS
|
||||||
if !strings.Contains(body, "/static/tailwind.js") {
|
if !strings.Contains(body, "/ui/static/vendor/tailwind.js") {
|
||||||
t.Error("dashboard should link to Tailwind JS")
|
t.Error("dashboard should link to Tailwind JS")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -473,7 +575,7 @@ func TestVersionShowWithHitCount(t *testing.T) {
|
||||||
t.Fatalf("failed to upsert artifact: %v", err)
|
t.Fatalf("failed to upsert artifact: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/test/1.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/test/1.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
@ -525,7 +627,7 @@ func TestSearchWithNullValues(t *testing.T) {
|
||||||
t.Fatalf("failed to upsert artifact: %v", err)
|
t.Fatalf("failed to upsert artifact: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search?q=test", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=test", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
@ -617,7 +719,7 @@ func TestSearchRedirectsWhenEmpty(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search", nil)
|
req := httptest.NewRequest("GET", "/ui/search", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -626,8 +728,8 @@ func TestSearchRedirectsWhenEmpty(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
loc := w.Header().Get("Location")
|
loc := w.Header().Get("Location")
|
||||||
if loc != "/" {
|
if loc != "/ui/" {
|
||||||
t.Errorf("expected redirect to /, got %q", loc)
|
t.Errorf("expected redirect to /ui/, got %q", loc)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -635,7 +737,7 @@ func TestPackageShowPage_NotFoundServer(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/nonexistent-srv", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/nonexistent-srv", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -648,7 +750,7 @@ func TestVersionShowPage_NotFoundServer(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/nonexistent-srv/1.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/nonexistent-srv/1.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -679,7 +781,7 @@ func TestPackageShowPage_WithLicense(t *testing.T) {
|
||||||
t.Fatalf("failed to upsert version: %v", err)
|
t.Fatalf("failed to upsert version: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/show-test-lic", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/show-test-lic", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -721,8 +823,8 @@ func TestComposerNamespacedPackageRoutes(t *testing.T) {
|
||||||
url string
|
url string
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"package show", "/package/composer/monolog/monolog", "monolog/monolog"},
|
{"package show", "/ui/package/composer/monolog/monolog", "monolog/monolog"},
|
||||||
{"version show", "/package/composer/symfony/console/6.0.0", "symfony/console"},
|
{"version show", "/ui/package/composer/symfony/console/6.0.0", "symfony/console"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
@ -779,11 +881,11 @@ func TestNamespacedPackageRoutes(t *testing.T) {
|
||||||
url string
|
url string
|
||||||
want int
|
want int
|
||||||
}{
|
}{
|
||||||
{"npm scoped package show", "/package/npm/@babel/core", http.StatusOK},
|
{"npm scoped package show", "/ui/package/npm/@babel/core", http.StatusOK},
|
||||||
{"golang module show", "/package/golang/github.com/stretchr/testify", http.StatusOK},
|
{"golang module show", "/ui/package/golang/github.com/stretchr/testify", http.StatusOK},
|
||||||
{"oci image show", "/package/oci/library/nginx", http.StatusOK},
|
{"oci image show", "/ui/package/oci/library/nginx", http.StatusOK},
|
||||||
{"conda package show", "/package/conda/conda-forge/numpy", http.StatusOK},
|
{"conda package show", "/ui/package/conda/conda-forge/numpy", http.StatusOK},
|
||||||
{"conan package show", "/package/conan/zlib/1.2.13@demo/stable", http.StatusOK},
|
{"conan package show", "/ui/package/conan/zlib/1.2.13@demo/stable", http.StatusOK},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
@ -806,7 +908,7 @@ func TestSearchPage_WithSeededResults(t *testing.T) {
|
||||||
|
|
||||||
seedTestPackage(t, ts.db, "searchable-pkg")
|
seedTestPackage(t, ts.db, "searchable-pkg")
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search?q=searchable", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=searchable", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -854,7 +956,7 @@ func TestSearchPage_PaginationMultiPage(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// First page
|
// First page
|
||||||
req := httptest.NewRequest("GET", "/search?q=page-test", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=page-test", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -868,7 +970,7 @@ func TestSearchPage_PaginationMultiPage(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second page
|
// Second page
|
||||||
req = httptest.NewRequest("GET", "/search?q=page-test&page=2", nil)
|
req = httptest.NewRequest("GET", "/ui/search?q=page-test&page=2", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -934,7 +1036,7 @@ func TestSearchPage_EcosystemFilterWithSeededData(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Search with ecosystem filter for npm only
|
// Search with ecosystem filter for npm only
|
||||||
req := httptest.NewRequest("GET", "/search?q=eco-filter&ecosystem=npm", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=eco-filter&ecosystem=npm", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -957,7 +1059,7 @@ func TestHandlePackagesListPage(t *testing.T) {
|
||||||
|
|
||||||
seedTestPackage(t, ts.db, "list-test")
|
seedTestPackage(t, ts.db, "list-test")
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/packages", nil)
|
req := httptest.NewRequest("GET", "/ui/packages", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
|
||||||
12
internal/server/static/vendor/lucide.min.js
vendored
Normal file
12
internal/server/static/vendor/lucide.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -5,19 +5,29 @@
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>{{block "title" .}}git-pkgs proxy{{end}}</title>
|
<title>{{block "title" .}}git-pkgs proxy{{end}}</title>
|
||||||
<script src="/static/tailwind.js"></script>
|
{{if .UIBaseURL}}
|
||||||
|
<link rel="canonical" href="{{.UIBaseURL}}{{.CanonicalPath}}">
|
||||||
|
<meta property="og:url" content="{{.UIBaseURL}}{{.CanonicalPath}}">
|
||||||
|
<meta property="og:title" content="{{template "title" .}}">
|
||||||
|
<meta property="og:site_name" content="git-pkgs proxy">
|
||||||
|
{{end}}
|
||||||
|
<script src="/ui/static/vendor/tailwind.js"></script>
|
||||||
|
<script src="/ui/static/vendor/lucide.min.js" defer></script>
|
||||||
<script>
|
<script>
|
||||||
tailwind.config = { darkMode: 'class' }
|
tailwind.config = { darkMode: 'class' }
|
||||||
if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
|
if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
|
||||||
document.documentElement.classList.add('dark')
|
document.documentElement.classList.add('dark')
|
||||||
}
|
}
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
if (window.lucide) lucide.createIcons({ attrs: { 'aria-hidden': 'true', focusable: 'false' } })
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
{{block "head" .}}{{end}}
|
{{block "head" .}}{{end}}
|
||||||
</head>
|
</head>
|
||||||
<body class="h-full bg-gray-50 dark:bg-gray-950 text-gray-900 dark:text-gray-100">
|
<body class="min-h-full flex flex-col bg-gray-50 dark:bg-gray-950 text-gray-900 dark:text-gray-100">
|
||||||
{{template "header" .}}
|
{{template "header" .}}
|
||||||
|
|
||||||
<main class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
<main class="flex-1 w-full max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
||||||
{{block "content" .}}{{end}}
|
{{block "content" .}}{{end}}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,18 @@
|
||||||
<div>
|
<div>
|
||||||
<h3 class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-3">About</h3>
|
<h3 class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-3">About</h3>
|
||||||
<p class="text-sm text-gray-600 dark:text-gray-400">
|
<p class="text-sm text-gray-600 dark:text-gray-400">
|
||||||
git-pkgs proxy is a caching proxy for package registries supporting 16+ ecosystems.
|
git-pkgs proxy is a caching proxy for package registries supporting 17+ ecosystems.
|
||||||
|
</p>
|
||||||
|
<p class="text-sm text-gray-600 dark:text-gray-400 mt-2">
|
||||||
|
<a href="https://github.com/git-pkgs/proxy" target="_blank" rel="noopener" class="inline-flex items-center gap-1 hover:text-gray-900 dark:hover:text-gray-100">
|
||||||
|
<i data-lucide="github" class="w-4 h-4"></i><span>github.com/git-pkgs/proxy</span>
|
||||||
|
</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h3 class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-3">Resources</h3>
|
<h3 class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-3">Resources</h3>
|
||||||
<ul class="space-y-2 text-sm">
|
<ul class="space-y-2 text-sm">
|
||||||
<li><a href="/install" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Configuration Guide</a></li>
|
<li><a href="/ui/install" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Configuration Guide</a></li>
|
||||||
<li><a href="/health" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Health Check</a></li>
|
<li><a href="/health" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Health Check</a></li>
|
||||||
<li><a href="/stats" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">API Stats</a></li>
|
<li><a href="/stats" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">API Stats</a></li>
|
||||||
<li><a href="/openapi.json" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">OpenAPI Spec</a></li>
|
<li><a href="/openapi.json" class="text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">OpenAPI Spec</a></li>
|
||||||
|
|
@ -26,11 +31,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-8 pt-8 border-t border-gray-200 dark:border-gray-800">
|
|
||||||
<p class="text-xs text-center text-gray-500 dark:text-gray-400">
|
|
||||||
Powered by <a href="https://github.com/git-pkgs" class="hover:text-gray-900 dark:hover:text-gray-100" target="_blank">git-pkgs</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,46 @@
|
||||||
{{define "header"}}
|
{{define "header"}}
|
||||||
<header class="sticky top-0 z-50 border-b border-gray-200 dark:border-gray-800 bg-white/80 dark:bg-gray-900/80 backdrop-blur-sm">
|
<header class="sticky top-0 z-50 border-b border-gray-200 dark:border-gray-800 bg-white/80 dark:bg-gray-900/80 backdrop-blur-sm">
|
||||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
<div class="flex justify-between items-center h-16">
|
<div class="flex justify-between items-center h-16 gap-4">
|
||||||
<div class="flex items-center gap-2">
|
<a href="/ui/" class="flex items-center gap-2 text-xl font-semibold hover:text-gray-700 dark:hover:text-gray-300 shrink-0">
|
||||||
<svg class="w-8 h-8 text-primary-600 dark:text-primary-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="w-8 h-8 text-primary-600 dark:text-primary-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
|
||||||
</svg>
|
</svg>
|
||||||
<a href="/" class="text-xl font-semibold hover:text-gray-700 dark:hover:text-gray-300">git-pkgs proxy</a>
|
<span>git-pkgs proxy</span>
|
||||||
|
</a>
|
||||||
|
<div class="hidden md:block flex-1 max-w-md mx-4">
|
||||||
|
{{template "search_form" .}}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 max-w-md mx-8">
|
<nav class="hidden md:flex items-center gap-6">
|
||||||
<form action="/search" method="get" class="relative">
|
{{template "nav_links" .}}
|
||||||
|
</nav>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<button id="theme-toggle" class="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors" aria-label="Toggle theme">
|
||||||
|
<svg class="w-5 h-5 hidden dark:block" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"/>
|
||||||
|
</svg>
|
||||||
|
<svg class="w-5 h-5 block dark:hidden" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<button id="nav-toggle" type="button" class="md:hidden p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors" aria-label="Toggle menu" aria-expanded="false" aria-controls="mobile-nav">
|
||||||
|
<span class="nav-icon-open"><i data-lucide="menu" class="w-5 h-5"></i></span>
|
||||||
|
<span class="nav-icon-close hidden"><i data-lucide="x" class="w-5 h-5"></i></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="mobile-nav" class="hidden md:hidden pb-4 space-y-3">
|
||||||
|
{{template "search_form" .}}
|
||||||
|
<nav class="flex flex-col">
|
||||||
|
{{template "nav_links" .}}
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
{{define "search_form"}}
|
||||||
|
<form action="/ui/search" method="get" class="relative">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
name="q"
|
name="q"
|
||||||
|
|
@ -20,21 +51,10 @@
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
|
||||||
</svg>
|
</svg>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
{{end}}
|
||||||
<nav class="flex items-center gap-6">
|
|
||||||
<a href="/install" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Install</a>
|
{{define "nav_links"}}
|
||||||
<a href="/health" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">Health</a>
|
<a href="/ui/install" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 py-2 md:py-0">Install</a>
|
||||||
<a href="/stats" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100">API</a>
|
<a href="/health" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 py-2 md:py-0">Health</a>
|
||||||
<button id="theme-toggle" class="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors">
|
<a href="/stats" class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 py-2 md:py-0">API</a>
|
||||||
<svg class="w-5 h-5 hidden dark:block" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"/>
|
|
||||||
</svg>
|
|
||||||
<svg class="w-5 h-5 block dark:hidden" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
||||||
|
|
@ -9,5 +9,18 @@
|
||||||
localStorage.theme = 'dark';
|
localStorage.theme = 'dark';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
const toggle = document.getElementById('nav-toggle');
|
||||||
|
const menu = document.getElementById('mobile-nav');
|
||||||
|
if (!toggle || !menu) return;
|
||||||
|
toggle.addEventListener('click', function() {
|
||||||
|
const open = toggle.getAttribute('aria-expanded') === 'true';
|
||||||
|
toggle.setAttribute('aria-expanded', String(!open));
|
||||||
|
menu.classList.toggle('hidden');
|
||||||
|
toggle.querySelector('.nav-icon-open').classList.toggle('hidden');
|
||||||
|
toggle.querySelector('.nav-icon-close').classList.toggle('hidden');
|
||||||
|
});
|
||||||
|
})();
|
||||||
</script>
|
</script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,11 @@
|
||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
||||||
<a href="/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
<a href="/ui/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<a href="/package/{{.Ecosystem}}/{{.PackageName}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.PackageName}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.PackageName}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.PackageName}}</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<a href="/package/{{.Ecosystem}}/{{.PackageName}}/{{.Version}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.Version}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.PackageName}}/{{.Version}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.Version}}</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<span>Browse Source</span>
|
<span>Browse Source</span>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
@ -65,7 +65,7 @@ function escapeHTML(str) {
|
||||||
// Load file tree for a directory
|
// Load file tree for a directory
|
||||||
async function loadFileTree(path = '') {
|
async function loadFileTree(path = '') {
|
||||||
try {
|
try {
|
||||||
const url = `/api/browse/${ecosystem}/${packageName}/${version}?path=${encodeURIComponent(path)}`;
|
const url = `/ui/api/browse/${ecosystem}/${packageName}/${version}?path=${encodeURIComponent(path)}`;
|
||||||
const response = await fetch(url);
|
const response = await fetch(url);
|
||||||
if (!response.ok) throw new Error('Failed to load directory');
|
if (!response.ok) throw new Error('Failed to load directory');
|
||||||
|
|
||||||
|
|
@ -100,41 +100,44 @@ function renderFileTree(files, basePath) {
|
||||||
if (basePath) {
|
if (basePath) {
|
||||||
const parentPath = basePath.split('/').slice(0, -2).join('/');
|
const parentPath = basePath.split('/').slice(0, -2).join('/');
|
||||||
html += `
|
html += `
|
||||||
<div class="px-2 py-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded cursor-pointer text-sm"
|
<div class="px-2 py-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded cursor-pointer text-sm flex items-center gap-2 text-gray-500 dark:text-gray-400"
|
||||||
onclick="loadFileTree('${escapeHTML(parentPath)}'); currentPath='${escapeHTML(parentPath)}';">
|
onclick="loadFileTree('${escapeHTML(parentPath)}'); currentPath='${escapeHTML(parentPath)}';">
|
||||||
<span class="text-gray-500 dark:text-gray-400">📁 ..</span>
|
<i data-lucide="corner-left-up" class="w-4 h-4 shrink-0"></i><span>..</span>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render files and directories
|
// Render files and directories
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
const icon = file.is_dir ? '📁' : '📄';
|
const iconName = file.is_dir ? 'folder' : 'file';
|
||||||
const classes = 'px-2 py-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded cursor-pointer text-sm truncate';
|
const iconClass = file.is_dir ? 'text-amber-500 dark:text-amber-400' : 'text-gray-500 dark:text-gray-400';
|
||||||
|
const classes = 'px-2 py-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded cursor-pointer text-sm flex items-center gap-2';
|
||||||
|
const iconHTML = `<i data-lucide="${iconName}" class="w-4 h-4 shrink-0 ${iconClass}"></i>`;
|
||||||
|
|
||||||
if (file.is_dir) {
|
if (file.is_dir) {
|
||||||
html += `
|
html += `
|
||||||
<div class="${classes}" onclick="loadFileTree('${escapeHTML(file.path)}'); currentPath='${escapeHTML(file.path)}';">
|
<div class="${classes}" onclick="loadFileTree('${escapeHTML(file.path)}'); currentPath='${escapeHTML(file.path)}';">
|
||||||
<span>${icon} ${escapeHTML(file.name)}</span>
|
${iconHTML}<span class="truncate">${escapeHTML(file.name)}</span>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
} else {
|
} else {
|
||||||
html += `
|
html += `
|
||||||
<div class="${classes}" onclick="loadFile('${escapeHTML(file.path)}')">
|
<div class="${classes}" onclick="loadFile('${escapeHTML(file.path)}')">
|
||||||
<span>${icon} ${escapeHTML(file.name)}</span>
|
${iconHTML}<span class="truncate">${escapeHTML(file.name)}</span>
|
||||||
<span class="text-xs text-gray-500 dark:text-gray-400 ml-2">${formatSize(file.size)}</span>
|
<span class="text-xs text-gray-500 dark:text-gray-400 ml-auto shrink-0">${formatSize(file.size)}</span>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
container.innerHTML = html;
|
container.innerHTML = html;
|
||||||
|
if (window.lucide) lucide.createIcons({ attrs: { 'aria-hidden': 'true', focusable: 'false' } });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load and display file content
|
// Load and display file content
|
||||||
async function loadFile(path) {
|
async function loadFile(path) {
|
||||||
try {
|
try {
|
||||||
const url = `/api/browse/${ecosystem}/${packageName}/${version}/file/${path}`;
|
const url = `/ui/api/browse/${ecosystem}/${packageName}/${version}/file/${path}`;
|
||||||
const response = await fetch(url);
|
const response = await fetch(url);
|
||||||
if (!response.ok) throw new Error('Failed to load file');
|
if (!response.ok) throw new Error('Failed to load file');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
||||||
<a href="/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
<a href="/ui/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<a href="/package/{{.Ecosystem}}/{{.PackageName}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.PackageName}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.PackageName}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.PackageName}}</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<span>Compare Versions</span>
|
<span>Compare Versions</span>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
@ -79,7 +79,7 @@ const toVersion = '{{.ToVersion}}';
|
||||||
|
|
||||||
async function loadDiff() {
|
async function loadDiff() {
|
||||||
try {
|
try {
|
||||||
const url = `/api/compare/${ecosystem}/${packageName}/${fromVersion}/${toVersion}`;
|
const url = `/ui/api/compare/${ecosystem}/${packageName}/${fromVersion}/${toVersion}`;
|
||||||
const response = await fetch(url);
|
const response = await fetch(url);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@
|
||||||
<div class="min-w-0 flex-1">
|
<div class="min-w-0 flex-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
{{template "ecosystem_badge" .Ecosystem}}
|
{{template "ecosystem_badge" .Ecosystem}}
|
||||||
<a href="/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2 mt-1">
|
<div class="flex items-center gap-2 mt-1">
|
||||||
{{if .License}}<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-100 text-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-700 dark:bg-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-900 dark:text-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-300">{{.License}}</span>{{end}}
|
{{if .License}}<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-100 text-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-700 dark:bg-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-900 dark:text-{{if eq .LicenseCategory "permissive"}}green{{else if eq .LicenseCategory "copyleft"}}pink{{else}}gray{{end}}-300">{{.License}}</span>{{end}}
|
||||||
|
|
@ -81,7 +81,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="px-6 py-3 text-center border-t border-gray-200 dark:border-gray-800">
|
<div class="px-6 py-3 text-center border-t border-gray-200 dark:border-gray-800">
|
||||||
<a href="/packages?sort=hits" class="text-sm text-blue-600 dark:text-blue-400 hover:underline">See all packages →</a>
|
<a href="/ui/packages?sort=hits" class="text-sm text-blue-600 dark:text-blue-400 hover:underline">See all packages →</a>
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="px-6 py-12 text-center text-gray-500 dark:text-gray-400">No packages cached yet</div>
|
<div class="px-6 py-12 text-center text-gray-500 dark:text-gray-400">No packages cached yet</div>
|
||||||
|
|
@ -101,7 +101,7 @@
|
||||||
<div class="min-w-0 flex-1">
|
<div class="min-w-0 flex-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
{{template "ecosystem_badge" .Ecosystem}}
|
{{template "ecosystem_badge" .Ecosystem}}
|
||||||
<a href="/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
||||||
<span class="text-gray-500 dark:text-gray-400">@{{.Version}}</span>
|
<span class="text-gray-500 dark:text-gray-400">@{{.Version}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2 mt-1">
|
<div class="flex items-center gap-2 mt-1">
|
||||||
|
|
@ -117,7 +117,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="px-6 py-3 text-center border-t border-gray-200 dark:border-gray-800">
|
<div class="px-6 py-3 text-center border-t border-gray-200 dark:border-gray-800">
|
||||||
<a href="/packages?sort=cached_at" class="text-sm text-blue-600 dark:text-blue-400 hover:underline">See all packages →</a>
|
<a href="/ui/packages?sort=cached_at" class="text-sm text-blue-600 dark:text-blue-400 hover:underline">See all packages →</a>
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="px-6 py-12 text-center text-gray-500 dark:text-gray-400">No packages cached yet</div>
|
<div class="px-6 py-12 text-center text-gray-500 dark:text-gray-400">No packages cached yet</div>
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,15 @@
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{if and .UIBaseURL .BaseURL (ne .UIBaseURL .BaseURL)}}
|
||||||
|
<div class="mb-8 p-4 bg-amber-50 dark:bg-amber-950 border border-amber-200 dark:border-amber-900 rounded-xl text-sm">
|
||||||
|
<p class="text-amber-900 dark:text-amber-100">
|
||||||
|
This UI is hosted at <code class="font-mono">{{.UIBaseURL}}</code>, but package managers should be configured to use
|
||||||
|
<code class="font-mono">{{.BaseURL}}</code> for the URLs shown below.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800">
|
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800">
|
||||||
<div class="divide-y divide-gray-200 dark:divide-gray-800">
|
<div class="divide-y divide-gray-200 dark:divide-gray-800">
|
||||||
{{range .Registries}}
|
{{range .Registries}}
|
||||||
|
|
@ -37,7 +46,7 @@
|
||||||
<h2 class="text-lg font-semibold mb-2 text-blue-900 dark:text-blue-100">Need Help?</h2>
|
<h2 class="text-lg font-semibold mb-2 text-blue-900 dark:text-blue-100">Need Help?</h2>
|
||||||
<p class="text-sm text-blue-800 dark:text-blue-200">
|
<p class="text-sm text-blue-800 dark:text-blue-200">
|
||||||
After configuring your package manager, install packages as usual. The proxy will automatically cache them.
|
After configuring your package manager, install packages as usual. The proxy will automatically cache them.
|
||||||
Check the <a href="/" class="underline hover:no-underline">dashboard</a> to see cached packages.
|
Check the <a href="/ui/" class="underline hover:no-underline">dashboard</a> to see cached packages.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
<div class="px-6 py-3 flex items-center justify-between version-row">
|
<div class="px-6 py-3 flex items-center justify-between version-row">
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
<input type="checkbox" class="version-checkbox hidden" data-version="{{.Version}}" />
|
<input type="checkbox" class="version-checkbox hidden" data-version="{{.Version}}" />
|
||||||
<a href="/package/{{$.Package.Ecosystem}}/{{$.Package.Name}}/{{.Version}}" class="font-mono text-sm hover:text-blue-600 dark:hover:text-blue-400">{{.PURL}}</a>
|
<a href="/ui/package/{{$.Package.Ecosystem}}/{{$.Package.Name}}/{{.Version}}" class="font-mono text-sm hover:text-blue-600 dark:hover:text-blue-400">{{.PURL}}</a>
|
||||||
{{if .Yanked}}<span class="ml-2 inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300">yanked</span>{{end}}
|
{{if .Yanked}}<span class="ml-2 inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300">yanked</span>{{end}}
|
||||||
</div>
|
</div>
|
||||||
{{if .PublishedAt.Valid}}<span class="text-sm text-gray-500 dark:text-gray-400">{{.PublishedAt.Time.Format "2006-01-02"}}</span>{{end}}
|
{{if .PublishedAt.Valid}}<span class="text-sm text-gray-500 dark:text-gray-400">{{.PublishedAt.Time.Format "2006-01-02"}}</span>{{end}}
|
||||||
|
|
@ -123,7 +123,7 @@ document.addEventListener('change', function(e) {
|
||||||
// Navigate to compare page
|
// Navigate to compare page
|
||||||
const v1 = checked[0].dataset.version;
|
const v1 = checked[0].dataset.version;
|
||||||
const v2 = checked[1].dataset.version;
|
const v2 = checked[1].dataset.version;
|
||||||
window.location.href = `/package/${ecosystem}/${packageName}/compare/${v1}...${v2}`;
|
window.location.href = `/ui/package/${ecosystem}/${packageName}/compare/${v1}...${v2}`;
|
||||||
} else if (checked.length > 2) {
|
} else if (checked.length > 2) {
|
||||||
// Uncheck the oldest selection
|
// Uncheck the oldest selection
|
||||||
checked[0].checked = false;
|
checked[0].checked = false;
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
<div class="min-w-0 flex-1">
|
<div class="min-w-0 flex-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
{{template "ecosystem_badge" .Ecosystem}}
|
{{template "ecosystem_badge" .Ecosystem}}
|
||||||
<a href="/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
||||||
{{if .LatestVersion}}
|
{{if .LatestVersion}}
|
||||||
<span class="text-gray-500 dark:text-gray-400">@{{.LatestVersion}}</span>
|
<span class="text-gray-500 dark:text-gray-400">@{{.LatestVersion}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
@ -67,7 +67,7 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800 p-12 text-center">
|
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800 p-12 text-center">
|
||||||
<p class="text-gray-500 dark:text-gray-400">No cached packages found{{if .Ecosystem}} in {{.Ecosystem}}{{end}}</p>
|
<p class="text-gray-500 dark:text-gray-400">No cached packages found{{if .Ecosystem}} in {{.Ecosystem}}{{end}}</p>
|
||||||
<a href="/" class="mt-4 inline-block text-sm text-blue-600 dark:text-blue-400 hover:underline">Return to dashboard</a>
|
<a href="/ui/" class="mt-4 inline-block text-sm text-blue-600 dark:text-blue-400 hover:underline">Return to dashboard</a>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
|
|
@ -100,7 +100,7 @@ document.getElementById('ecosystem-filter').addEventListener('change', function(
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
if (ecosystem) params.set('ecosystem', ecosystem);
|
if (ecosystem) params.set('ecosystem', ecosystem);
|
||||||
if (sortBy) params.set('sort', sortBy);
|
if (sortBy) params.set('sort', sortBy);
|
||||||
window.location.href = '/packages?' + params.toString();
|
window.location.href = '/ui/packages?' + params.toString();
|
||||||
});
|
});
|
||||||
|
|
||||||
document.getElementById('sort-by').addEventListener('change', function(e) {
|
document.getElementById('sort-by').addEventListener('change', function(e) {
|
||||||
|
|
@ -109,7 +109,7 @@ document.getElementById('sort-by').addEventListener('change', function(e) {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
if (ecosystem) params.set('ecosystem', ecosystem);
|
if (ecosystem) params.set('ecosystem', ecosystem);
|
||||||
if (sortBy) params.set('sort', sortBy);
|
if (sortBy) params.set('sort', sortBy);
|
||||||
window.location.href = '/packages?' + params.toString();
|
window.location.href = '/ui/packages?' + params.toString();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
<div class="min-w-0 flex-1">
|
<div class="min-w-0 flex-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
{{template "ecosystem_badge" .Ecosystem}}
|
{{template "ecosystem_badge" .Ecosystem}}
|
||||||
<a href="/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
<a href="/ui/package/{{.Ecosystem}}/{{.Name}}" class="font-medium truncate hover:text-blue-600 dark:hover:text-blue-400">{{.Name}}</a>
|
||||||
{{if .LatestVersion}}
|
{{if .LatestVersion}}
|
||||||
<span class="text-gray-500 dark:text-gray-400">@{{.LatestVersion}}</span>
|
<span class="text-gray-500 dark:text-gray-400">@{{.LatestVersion}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800 p-12 text-center">
|
<div class="bg-white dark:bg-gray-900 rounded-xl shadow-sm border border-gray-200 dark:border-gray-800 p-12 text-center">
|
||||||
<p class="text-gray-500 dark:text-gray-400">No packages found matching "{{.Query}}"</p>
|
<p class="text-gray-500 dark:text-gray-400">No packages found matching "{{.Query}}"</p>
|
||||||
<a href="/" class="mt-4 inline-block text-sm text-blue-600 dark:text-blue-400 hover:underline">Return to dashboard</a>
|
<a href="/ui/" class="mt-4 inline-block text-sm text-blue-600 dark:text-blue-400 hover:underline">Return to dashboard</a>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
<nav class="text-sm text-gray-600 dark:text-gray-400 mb-4">
|
||||||
<a href="/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
<a href="/ui/" class="hover:text-gray-900 dark:hover:text-gray-100">Home</a>
|
||||||
<span class="mx-2">/</span>
|
<span class="mx-2">/</span>
|
||||||
<a href="/package/{{.Package.Ecosystem}}/{{.Package.Name}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.Package.Name}}</a>
|
<a href="/ui/package/{{.Package.Ecosystem}}/{{.Package.Name}}" class="hover:text-gray-900 dark:hover:text-gray-100">{{.Package.Name}}</a>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="flex items-center gap-3 mb-2">
|
<div class="flex items-center gap-3 mb-2">
|
||||||
{{template "ecosystem_badge" .Package.Ecosystem}}
|
{{template "ecosystem_badge" .Package.Ecosystem}}
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .HasCachedArtifact}}
|
{{if .HasCachedArtifact}}
|
||||||
<div class="mt-4">
|
<div class="mt-4">
|
||||||
<a href="/package/{{.Package.Ecosystem}}/{{.Package.Name}}/{{.Version.Version}}/browse"
|
<a href="/ui/package/{{.Package.Ecosystem}}/{{.Package.Name}}/{{.Version.Version}}/browse"
|
||||||
class="inline-flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors">
|
class="inline-flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors">
|
||||||
<svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path>
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,12 @@ func TestTemplatesRenderAllPages(t *testing.T) {
|
||||||
{Ecosystem: "cargo", Name: "serde", Version: "1.0.0", Size: "200 KB", CachedAt: "1 hour ago"},
|
{Ecosystem: "cargo", Name: "serde", Version: "1.0.0", Size: "200 KB", CachedAt: "1 hour ago"},
|
||||||
},
|
},
|
||||||
}},
|
}},
|
||||||
{"install", struct{ Registries []RegistryConfig }{
|
{"install", struct {
|
||||||
|
Layout
|
||||||
|
BaseURL string
|
||||||
|
Registries []RegistryConfig
|
||||||
|
}{
|
||||||
|
BaseURL: "http://localhost:8080",
|
||||||
Registries: getRegistryConfigs("http://localhost:8080"),
|
Registries: getRegistryConfigs("http://localhost:8080"),
|
||||||
}},
|
}},
|
||||||
{"search", SearchPageData{
|
{"search", SearchPageData{
|
||||||
|
|
@ -153,6 +158,108 @@ func TestTemplatesRenderAllPages(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRenderEmitsCanonicalAndOG(t *testing.T) {
|
||||||
|
templates := &Templates{}
|
||||||
|
|
||||||
|
data := DashboardData{
|
||||||
|
Layout: Layout{
|
||||||
|
UIBaseURL: "https://ui.example.com/ui",
|
||||||
|
CanonicalPath: "/ui/",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
if err := templates.Render(w, "dashboard", data); err != nil {
|
||||||
|
t.Fatalf("Render failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := w.Body.String()
|
||||||
|
want := []string{
|
||||||
|
`<link rel="canonical" href="https://ui.example.com/ui/ui/">`,
|
||||||
|
`<meta property="og:url" content="https://ui.example.com/ui/ui/">`,
|
||||||
|
`<meta property="og:site_name" content="git-pkgs proxy">`,
|
||||||
|
}
|
||||||
|
for _, s := range want {
|
||||||
|
if !strings.Contains(body, s) {
|
||||||
|
t.Errorf("rendered body missing %q", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderOmitsCanonicalWhenUIBaseURLUnset(t *testing.T) {
|
||||||
|
templates := &Templates{}
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
if err := templates.Render(w, "dashboard", DashboardData{}); err != nil {
|
||||||
|
t.Fatalf("Render failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := w.Body.String()
|
||||||
|
if strings.Contains(body, `rel="canonical"`) {
|
||||||
|
t.Error("canonical tag should be omitted when UIBaseURL is empty")
|
||||||
|
}
|
||||||
|
if strings.Contains(body, `property="og:url"`) {
|
||||||
|
t.Error("og:url tag should be omitted when UIBaseURL is empty")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInstallPageBannerWhenUIDiffersFromBaseURL(t *testing.T) {
|
||||||
|
templates := &Templates{}
|
||||||
|
|
||||||
|
data := struct {
|
||||||
|
Layout
|
||||||
|
BaseURL string
|
||||||
|
Registries []RegistryConfig
|
||||||
|
}{
|
||||||
|
Layout: Layout{
|
||||||
|
UIBaseURL: "https://ui.example.com/ui",
|
||||||
|
CanonicalPath: "/ui/install",
|
||||||
|
},
|
||||||
|
BaseURL: "http://pkg-proxy:8080",
|
||||||
|
Registries: getRegistryConfigs("http://pkg-proxy:8080"),
|
||||||
|
}
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
if err := templates.Render(w, "install", data); err != nil {
|
||||||
|
t.Fatalf("Render failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := w.Body.String()
|
||||||
|
if !strings.Contains(body, "https://ui.example.com/ui") || !strings.Contains(body, "http://pkg-proxy:8080") {
|
||||||
|
t.Error("install banner should mention both UIBaseURL and BaseURL when they differ")
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "package managers should be configured") {
|
||||||
|
t.Error("install banner copy missing")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInstallPageNoBannerWhenURLsMatch(t *testing.T) {
|
||||||
|
templates := &Templates{}
|
||||||
|
|
||||||
|
data := struct {
|
||||||
|
Layout
|
||||||
|
BaseURL string
|
||||||
|
Registries []RegistryConfig
|
||||||
|
}{
|
||||||
|
Layout: Layout{
|
||||||
|
UIBaseURL: "http://localhost:8080",
|
||||||
|
CanonicalPath: "/ui/install",
|
||||||
|
},
|
||||||
|
BaseURL: "http://localhost:8080",
|
||||||
|
Registries: getRegistryConfigs("http://localhost:8080"),
|
||||||
|
}
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
if err := templates.Render(w, "install", data); err != nil {
|
||||||
|
t.Fatalf("Render failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := w.Body.String()
|
||||||
|
if strings.Contains(body, "package managers should be configured") {
|
||||||
|
t.Error("install banner should be hidden when UIBaseURL == BaseURL")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestTemplatesLazyLoading(t *testing.T) {
|
func TestTemplatesLazyLoading(t *testing.T) {
|
||||||
templates := &Templates{}
|
templates := &Templates{}
|
||||||
|
|
||||||
|
|
@ -182,7 +289,7 @@ func TestInstallPage(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/install", nil)
|
req := httptest.NewRequest("GET", "/ui/install", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -193,7 +300,7 @@ func TestInstallPage(t *testing.T) {
|
||||||
body := w.Body.String()
|
body := w.Body.String()
|
||||||
|
|
||||||
// Should contain instructions for all registries
|
// Should contain instructions for all registries
|
||||||
registries := []string{"npm", "Cargo", "RubyGems", "Go Modules", "PyPI", "Maven", "NuGet", "Composer", "Conan", "Conda", "CRAN"}
|
registries := []string{"npm", "Cargo", "RubyGems", "Go Modules", "PyPI", "Maven", "Gradle Build Cache", "NuGet", "Composer", "Conan", "Conda", "CRAN"}
|
||||||
for _, reg := range registries {
|
for _, reg := range registries {
|
||||||
if !strings.Contains(body, reg) {
|
if !strings.Contains(body, reg) {
|
||||||
t.Errorf("install page should contain %s instructions", reg)
|
t.Errorf("install page should contain %s instructions", reg)
|
||||||
|
|
@ -221,7 +328,7 @@ func TestPackageShowPage(t *testing.T) {
|
||||||
t.Fatalf("failed to upsert version: %v", err)
|
t.Fatalf("failed to upsert version: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/test-show", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/test-show", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -245,7 +352,7 @@ func TestPackageShowPage_NotFound(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/nonexistent", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/nonexistent", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -258,7 +365,7 @@ func TestVersionShowPage_NotFound(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/package/npm/nonexistent/1.0.0", nil)
|
req := httptest.NewRequest("GET", "/ui/package/npm/nonexistent/1.0.0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -271,7 +378,7 @@ func TestSearchPage_EmptyQuery(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search", nil)
|
req := httptest.NewRequest("GET", "/ui/search", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -285,7 +392,7 @@ func TestSearchPage_WithQuery(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search?q=test", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=test", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -304,7 +411,7 @@ func TestSearchPage_Pagination(t *testing.T) {
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
// Page 0 or negative should default to page 1
|
// Page 0 or negative should default to page 1
|
||||||
req := httptest.NewRequest("GET", "/search?q=test&page=0", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=test&page=0", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -313,7 +420,7 @@ func TestSearchPage_Pagination(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Non-numeric page should default to page 1
|
// Non-numeric page should default to page 1
|
||||||
req = httptest.NewRequest("GET", "/search?q=test&page=abc", nil)
|
req = httptest.NewRequest("GET", "/ui/search?q=test&page=abc", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
@ -326,7 +433,7 @@ func TestSearchPage_EcosystemFilter(t *testing.T) {
|
||||||
ts := newTestServer(t)
|
ts := newTestServer(t)
|
||||||
defer ts.close()
|
defer ts.close()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/search?q=test&ecosystem=npm", nil)
|
req := httptest.NewRequest("GET", "/ui/search?q=test&ecosystem=npm", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
ts.handler.ServeHTTP(w, req)
|
ts.handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,15 @@ import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"gocloud.dev/blob"
|
"gocloud.dev/blob"
|
||||||
|
_ "gocloud.dev/blob/azureblob"
|
||||||
_ "gocloud.dev/blob/fileblob"
|
_ "gocloud.dev/blob/fileblob"
|
||||||
_ "gocloud.dev/blob/s3blob"
|
_ "gocloud.dev/blob/s3blob"
|
||||||
"gocloud.dev/gcerrors"
|
"gocloud.dev/gcerrors"
|
||||||
|
|
@ -138,6 +141,20 @@ func (b *Blob) Delete(ctx context.Context, path string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *Blob) SignedURL(ctx context.Context, path string, expiry time.Duration) (string, error) {
|
||||||
|
url, err := b.bucket.SignedURL(ctx, path, &blob.SignedURLOptions{
|
||||||
|
Method: http.MethodGet,
|
||||||
|
Expiry: expiry,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
if gcerrors.Code(err) == gcerrors.Unimplemented {
|
||||||
|
return "", ErrSignedURLUnsupported
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("signing URL: %w", err)
|
||||||
|
}
|
||||||
|
return url, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (b *Blob) Size(ctx context.Context, path string) (int64, error) {
|
func (b *Blob) Size(ctx context.Context, path string) (int64, error) {
|
||||||
attrs, err := b.bucket.Attributes(ctx, path)
|
attrs, err := b.bucket.Attributes(ctx, path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -167,6 +184,35 @@ func (b *Blob) UsedSpace(ctx context.Context) (int64, error) {
|
||||||
return total, nil
|
return total, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ListPrefix returns object metadata for keys under a prefix.
|
||||||
|
func (b *Blob) ListPrefix(ctx context.Context, prefix string) ([]ObjectInfo, error) {
|
||||||
|
iter := b.bucket.List(&blob.ListOptions{Prefix: prefix})
|
||||||
|
objects := make([]ObjectInfo, 0)
|
||||||
|
|
||||||
|
for {
|
||||||
|
obj, err := iter.Next(ctx)
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("listing objects: %w", err)
|
||||||
|
}
|
||||||
|
if obj.IsDir {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
info := ObjectInfo{
|
||||||
|
Path: obj.Key,
|
||||||
|
Size: obj.Size,
|
||||||
|
ModTime: obj.ModTime,
|
||||||
|
}
|
||||||
|
|
||||||
|
objects = append(objects, info)
|
||||||
|
}
|
||||||
|
|
||||||
|
return objects, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (b *Blob) Close() error {
|
func (b *Blob) Close() error {
|
||||||
return b.bucket.Close()
|
return b.bucket.Close()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestOpenBucket(t *testing.T) {
|
func TestOpenBucket(t *testing.T) {
|
||||||
|
|
@ -188,6 +189,18 @@ func TestBlobLargeFile(t *testing.T) {
|
||||||
assertLargeFileRoundTrip(t, createTestBlob(t))
|
assertLargeFileRoundTrip(t, createTestBlob(t))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBlobSignedURLUnsupported(t *testing.T) {
|
||||||
|
b := createTestBlob(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// fileblob has no URL signer configured, so this must surface as
|
||||||
|
// ErrSignedURLUnsupported rather than a generic error.
|
||||||
|
_, err := b.SignedURL(ctx, "test/file.txt", time.Minute)
|
||||||
|
if !errors.Is(err, ErrSignedURLUnsupported) {
|
||||||
|
t.Errorf("SignedURL on fileblob = %v, want ErrSignedURLUnsupported", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestBlobOverwrite(t *testing.T) {
|
func TestBlobOverwrite(t *testing.T) {
|
||||||
b := createTestBlob(t)
|
b := createTestBlob(t)
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,11 @@ import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
fsys "io/fs"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Filesystem implements Storage using the local filesystem.
|
// Filesystem implements Storage using the local filesystem.
|
||||||
|
|
@ -30,12 +33,19 @@ func NewFilesystem(root string) (*Filesystem, error) {
|
||||||
return &Filesystem{root: absRoot}, nil
|
return &Filesystem{root: absRoot}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) fullPath(path string) string {
|
func (fs *Filesystem) fullPath(path string) (string, error) {
|
||||||
return filepath.Join(fs.root, filepath.FromSlash(path))
|
full := filepath.Clean(filepath.Join(fs.root, filepath.FromSlash(path)))
|
||||||
|
if full != fs.root && !strings.HasPrefix(full, fs.root+string(filepath.Separator)) {
|
||||||
|
return "", fmt.Errorf("%w: path escapes storage root", ErrNotFound)
|
||||||
|
}
|
||||||
|
return full, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) Store(ctx context.Context, path string, r io.Reader) (int64, string, error) {
|
func (fs *Filesystem) Store(ctx context.Context, path string, r io.Reader) (int64, string, error) {
|
||||||
fullPath := fs.fullPath(path)
|
fullPath, err := fs.fullPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0, "", err
|
||||||
|
}
|
||||||
|
|
||||||
dir := filepath.Dir(fullPath)
|
dir := filepath.Dir(fullPath)
|
||||||
if err := os.MkdirAll(dir, dirPermissions); err != nil {
|
if err := os.MkdirAll(dir, dirPermissions); err != nil {
|
||||||
|
|
@ -82,7 +92,10 @@ func (fs *Filesystem) Store(ctx context.Context, path string, r io.Reader) (int6
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) Open(ctx context.Context, path string) (io.ReadCloser, error) {
|
func (fs *Filesystem) Open(ctx context.Context, path string) (io.ReadCloser, error) {
|
||||||
fullPath := fs.fullPath(path)
|
fullPath, err := fs.fullPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
f, err := os.Open(fullPath)
|
f, err := os.Open(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -96,9 +109,12 @@ func (fs *Filesystem) Open(ctx context.Context, path string) (io.ReadCloser, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) Exists(ctx context.Context, path string) (bool, error) {
|
func (fs *Filesystem) Exists(ctx context.Context, path string) (bool, error) {
|
||||||
fullPath := fs.fullPath(path)
|
fullPath, err := fs.fullPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
_, err := os.Stat(fullPath)
|
_, err = os.Stat(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return false, nil
|
return false, nil
|
||||||
|
|
@ -110,9 +126,12 @@ func (fs *Filesystem) Exists(ctx context.Context, path string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) Delete(ctx context.Context, path string) error {
|
func (fs *Filesystem) Delete(ctx context.Context, path string) error {
|
||||||
fullPath := fs.fullPath(path)
|
fullPath, err := fs.fullPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
err := os.Remove(fullPath)
|
err = os.Remove(fullPath)
|
||||||
if err != nil && !os.IsNotExist(err) {
|
if err != nil && !os.IsNotExist(err) {
|
||||||
return fmt.Errorf("removing file: %w", err)
|
return fmt.Errorf("removing file: %w", err)
|
||||||
}
|
}
|
||||||
|
|
@ -129,8 +148,15 @@ func (fs *Filesystem) Delete(ctx context.Context, path string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (fs *Filesystem) SignedURL(_ context.Context, _ string, _ time.Duration) (string, error) {
|
||||||
|
return "", ErrSignedURLUnsupported
|
||||||
|
}
|
||||||
|
|
||||||
func (fs *Filesystem) Size(ctx context.Context, path string) (int64, error) {
|
func (fs *Filesystem) Size(ctx context.Context, path string) (int64, error) {
|
||||||
fullPath := fs.fullPath(path)
|
fullPath, err := fs.fullPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
info, err := os.Stat(fullPath)
|
info, err := os.Stat(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -162,6 +188,54 @@ func (fs *Filesystem) UsedSpace(ctx context.Context) (int64, error) {
|
||||||
return total, nil
|
return total, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ListPrefix returns object metadata for paths under a prefix.
|
||||||
|
func (fs *Filesystem) ListPrefix(ctx context.Context, prefix string) ([]ObjectInfo, error) {
|
||||||
|
searchRoot, err := fs.fullPath(prefix)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := os.Stat(searchRoot); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return []ObjectInfo{}, nil
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("stat prefix: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
objects := make([]ObjectInfo, 0)
|
||||||
|
err = filepath.WalkDir(searchRoot, func(path string, entry fsys.DirEntry, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if entry.IsDir() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
info, err := entry.Info()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
relPath, err := filepath.Rel(fs.root, path)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
objects = append(objects, ObjectInfo{
|
||||||
|
Path: filepath.ToSlash(relPath),
|
||||||
|
Size: info.Size(),
|
||||||
|
ModTime: info.ModTime(),
|
||||||
|
})
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("walking prefix: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return objects, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Root returns the root directory of the storage.
|
// Root returns the root directory of the storage.
|
||||||
func (fs *Filesystem) Root() string {
|
func (fs *Filesystem) Root() string {
|
||||||
return fs.root
|
return fs.root
|
||||||
|
|
@ -169,7 +243,8 @@ func (fs *Filesystem) Root() string {
|
||||||
|
|
||||||
// FullPath returns the full filesystem path for a storage path.
|
// FullPath returns the full filesystem path for a storage path.
|
||||||
// Useful for serving files directly or debugging.
|
// Useful for serving files directly or debugging.
|
||||||
func (fs *Filesystem) FullPath(path string) string {
|
// Returns an error if the resulting path would escape the storage root.
|
||||||
|
func (fs *Filesystem) FullPath(path string) (string, error) {
|
||||||
return fs.fullPath(path)
|
return fs.fullPath(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNewFilesystem(t *testing.T) {
|
func TestNewFilesystem(t *testing.T) {
|
||||||
|
|
@ -51,7 +52,10 @@ func TestFilesystemStore(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify file exists on disk
|
// Verify file exists on disk
|
||||||
fullPath := fs.FullPath("npm/lodash/4.17.21/lodash.tgz")
|
fullPath, err := fs.FullPath("npm/lodash/4.17.21/lodash.tgz")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("FullPath failed: %v", err)
|
||||||
|
}
|
||||||
data, err := os.ReadFile(fullPath)
|
data, err := os.ReadFile(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("reading stored file: %v", err)
|
t.Fatalf("reading stored file: %v", err)
|
||||||
|
|
@ -162,7 +166,10 @@ func TestFilesystemDelete(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Empty parent directories should be cleaned up
|
// Empty parent directories should be cleaned up
|
||||||
nestedDir := fs.FullPath("test/delete/nested")
|
nestedDir, err := fs.FullPath("test/delete/nested")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("FullPath failed: %v", err)
|
||||||
|
}
|
||||||
if _, err := os.Stat(nestedDir); !os.IsNotExist(err) {
|
if _, err := os.Stat(nestedDir); !os.IsNotExist(err) {
|
||||||
t.Error("empty nested directory not cleaned up")
|
t.Error("empty nested directory not cleaned up")
|
||||||
}
|
}
|
||||||
|
|
@ -236,6 +243,31 @@ func TestFilesystemLargeFile(t *testing.T) {
|
||||||
assertLargeFileRoundTrip(t, createTestFilesystem(t))
|
assertLargeFileRoundTrip(t, createTestFilesystem(t))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFilesystemRejectsTraversal(t *testing.T) {
|
||||||
|
tmp := t.TempDir()
|
||||||
|
fs, err := NewFilesystem(tmp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, p := range []string{"../etc/passwd", "../../etc/passwd", "a/../../etc/passwd"} {
|
||||||
|
if _, err := fs.Open(context.Background(), p); err == nil {
|
||||||
|
t.Errorf("Open(%q) should reject traversal", p)
|
||||||
|
}
|
||||||
|
if _, _, err := fs.Store(context.Background(), p, strings.NewReader("x")); err == nil {
|
||||||
|
t.Errorf("Store(%q) should reject traversal", p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilesystemSignedURLUnsupported(t *testing.T) {
|
||||||
|
fs := createTestFilesystem(t)
|
||||||
|
|
||||||
|
_, err := fs.SignedURL(context.Background(), "test/file.txt", time.Minute)
|
||||||
|
if !errors.Is(err, ErrSignedURLUnsupported) {
|
||||||
|
t.Errorf("SignedURL = %v, want ErrSignedURLUnsupported", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func createTestFilesystem(t *testing.T) *Filesystem {
|
func createTestFilesystem(t *testing.T) *Filesystem {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,26 @@ import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
const dirPermissions = 0755
|
const dirPermissions = 0755
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrNotFound = errors.New("artifact not found")
|
ErrNotFound = errors.New("artifact not found")
|
||||||
|
|
||||||
|
// ErrSignedURLUnsupported is returned by SignedURL when the backend
|
||||||
|
// cannot generate presigned URLs (e.g. local filesystem).
|
||||||
|
ErrSignedURLUnsupported = errors.New("signed URLs not supported by storage backend")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ObjectInfo contains metadata for a stored object.
|
||||||
|
type ObjectInfo struct {
|
||||||
|
Path string
|
||||||
|
Size int64
|
||||||
|
ModTime time.Time
|
||||||
|
}
|
||||||
|
|
||||||
// Storage defines the interface for artifact storage backends.
|
// Storage defines the interface for artifact storage backends.
|
||||||
type Storage interface {
|
type Storage interface {
|
||||||
// Store writes content from r to the given path.
|
// Store writes content from r to the given path.
|
||||||
|
|
@ -45,6 +57,10 @@ type Storage interface {
|
||||||
// Returns ErrNotFound if the path does not exist.
|
// Returns ErrNotFound if the path does not exist.
|
||||||
Size(ctx context.Context, path string) (int64, error)
|
Size(ctx context.Context, path string) (int64, error)
|
||||||
|
|
||||||
|
// SignedURL returns a presigned URL granting time-limited GET access to path.
|
||||||
|
// Returns ErrSignedURLUnsupported if the backend cannot generate presigned URLs.
|
||||||
|
SignedURL(ctx context.Context, path string, expiry time.Duration) (string, error)
|
||||||
|
|
||||||
// UsedSpace returns the total bytes used by all stored content.
|
// UsedSpace returns the total bytes used by all stored content.
|
||||||
UsedSpace(ctx context.Context) (int64, error)
|
UsedSpace(ctx context.Context) (int64, error)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue