diff --git a/README.md b/README.md index 4f0a78c..74f3f73 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Each type's paths, Terraform examples and local/virtual behaviour are in `docs/< - `deb`: [remote](docs/deb/remote.md), [remote-github](docs/deb/remote-github.md) - `docker`: [remote](docs/docker/remote.md), [local](docs/docker/local.md) - `generic`: [remote](docs/generic/remote.md) +- `gems`: [remote](docs/gems/remote.md) - `goproxy`: [remote](docs/goproxy/remote.md) - `helm`: [remote](docs/helm/remote.md), [local](docs/helm/local.md), [virtual](docs/helm/virtual.md) - `npm`: [remote](docs/npm/remote.md) diff --git a/docs/common/caching.md b/docs/common/caching.md index 40d70e3..d8eb782 100644 --- a/docs/common/caching.md +++ b/docs/common/caching.md @@ -94,7 +94,7 @@ Force a moving path mutable, e.g. branch tarballs on `generic`: Each type's page lists its auto-detected mutable and immutable paths: [alpine](../alpine/remote.md), [alpine github](../alpine/remote-github.md), [cargo](../cargo/remote.md), [deb](../deb/remote.md), [deb github](../deb/remote-github.md), -[docker](../docker/remote.md), [generic](../generic/remote.md), [goproxy](../goproxy/remote.md), +[docker](../docker/remote.md), [generic](../generic/remote.md), [gems](../gems/remote.md), [goproxy](../goproxy/remote.md), [helm](../helm/remote.md), [npm](../npm/remote.md), [nuget](../nuget/remote.md), [puppet](../puppet/remote.md), [pypi](../pypi/remote.md), [rpm](../rpm/remote.md), [rpm github](../rpm/remote-github.md), [terraform](../terraform/remote.md). diff --git a/docs/gems/remote.md b/docs/gems/remote.md new file mode 100644 index 0000000..9f4707b --- /dev/null +++ b/docs/gems/remote.md @@ -0,0 +1,7 @@ +# `gems` remote + +Shared classification, TTL and eviction rules: [caching](../common/caching.md). + +| Type | Mutable (auto-detected) | Immutable (auto-detected) | +|---|---|---| +| `gems` | compact index (`versions`, `info/*`, `names`), `*specs.4.8.gz` | `gems/*.gem`, `quick/Marshal.4.8/*.gemspec.rz` | diff --git a/e2e-docker/caching_gems_test.go b/e2e-docker/caching_gems_test.go new file mode 100644 index 0000000..9ef2c8b --- /dev/null +++ b/e2e-docker/caching_gems_test.go @@ -0,0 +1,7 @@ +//go:build dockere2e + +package e2edocker + +func init() { + cachingCases = append(cachingCases, cachingCase{"gems", "gems/mygem-1.0.0.gem", "gems/mygem-1.0.0.gem"}) +} diff --git a/e2e-docker/fixtures/gems/mygem-1.0.0.gem b/e2e-docker/fixtures/gems/mygem-1.0.0.gem new file mode 100644 index 0000000..666781d --- /dev/null +++ b/e2e-docker/fixtures/gems/mygem-1.0.0.gem @@ -0,0 +1 @@ +mygem-1.0.0 e2e fixture diff --git a/e2e/head_test.go b/e2e/head_test.go new file mode 100644 index 0000000..9c43be3 --- /dev/null +++ b/e2e/head_test.go @@ -0,0 +1,168 @@ +//go:build e2e + +package e2e + +import ( + "encoding/json" + "io" + "net/http" + "net/http/httptest" + "strconv" + "strings" + "testing" + "time" + + "git.unkin.net/unkin/artifactapi/internal/testsupport" +) + +// assertHeadMatchesGet checks HEAD returns GET's status, type and length with no body. +func assertHeadMatchesGet(t *testing.T, url string) { + t.Helper() + get, err := http.Get(url) + if err != nil { + t.Fatalf("GET: %v", err) + } + body, _ := io.ReadAll(get.Body) + get.Body.Close() + if get.StatusCode != http.StatusOK { + t.Fatalf("GET %s: %d %s", url, get.StatusCode, body) + } + + head, err := http.Head(url) + if err != nil { + t.Fatalf("HEAD: %v", err) + } + hb, _ := io.ReadAll(head.Body) + head.Body.Close() + if head.StatusCode != http.StatusOK { + t.Fatalf("HEAD %s: got %d, want 200", url, head.StatusCode) + } + if len(hb) != 0 { + t.Errorf("HEAD returned a %d-byte body", len(hb)) + } + if head.Header.Get("Content-Type") != get.Header.Get("Content-Type") { + t.Errorf("HEAD Content-Type %q, GET %q", head.Header.Get("Content-Type"), get.Header.Get("Content-Type")) + } + if head.ContentLength != int64(len(body)) { + t.Errorf("HEAD Content-Length %d, GET body %d bytes", head.ContentLength, len(body)) + } +} + +func TestProxyHeadNuGetRewritten(t *testing.T) { + var upstream *httptest.Server + upstream = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + json.NewEncoder(w).Encode(map[string]any{"version": "3.0.0", "resources": []map[string]string{ + {"@id": upstream.URL + "/v3-flatcontainer/", "@type": "PackageBaseAddress/3.0.0"}, + }}) + })) + defer upstream.Close() + + createRemote(t, mustFormat(`{"name": "head-nuget", "package_type": "nuget", "base_url": %q}`, upstream.URL+"/v3/index.json")) + defer deleteRemote(t, "head-nuget") + + assertHeadMatchesGet(t, apiURL("/api/v1/remote/head-nuget/index.json")) +} + +func TestProxyHeadGitHubRPMRepodata(t *testing.T) { + rpm := testsupport.MinimalRPM("demo", "1.2", "3", "x86_64") + var gh *httptest.Server + mux := http.NewServeMux() + mux.HandleFunc("/repos/acme/tools/releases", func(w http.ResponseWriter, r *http.Request) { + if p := r.URL.Query().Get("page"); p != "" && p != "1" { + w.Write([]byte("[]")) + return + } + json.NewEncoder(w).Encode([]map[string]any{{"tag_name": "v1.2-3", "assets": []map[string]any{{ + "name": "demo-1.2-3.x86_64.rpm", + "size": len(rpm), + "browser_download_url": gh.URL + "/acme/tools/releases/download/v1.2-3/demo-1.2-3.x86_64.rpm", + }}}}) + }) + mux.HandleFunc("/acme/tools/releases/download/", func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Length", strconv.Itoa(len(rpm))) + w.Write(rpm) + }) + gh = httptest.NewServer(mux) + defer gh.Close() + + createRemote(t, mustFormat(`{"name": "head-ghrpm", "package_type": "github_rpm", "base_url": %q, "releases_remote": "github"}`, gh.URL+"/repos/acme/tools")) + defer deleteRemote(t, "head-ghrpm") + + url := apiURL("/api/v1/remote/head-ghrpm/repodata/repomd.xml") + deadline := time.Now().Add(30 * time.Second) + for { + if _, status := getBody(t, url); status == http.StatusOK || time.Now().After(deadline) { + break + } + time.Sleep(500 * time.Millisecond) + } + assertHeadMatchesGet(t, url) +} + +func TestProxyHeadNpmUncachedPackument(t *testing.T) { + const abbreviated = "application/vnd.npm.install-v1+json" + upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + doc := map[string]any{"name": "left-pad", "versions": map[string]any{"1.3.0": map[string]any{}}} + if r.Header.Get("Accept") != abbreviated { + doc["readme"] = strings.Repeat("full packument ", 200) + } + json.NewEncoder(w).Encode(doc) + })) + defer upstream.Close() + + createRemote(t, mustFormat(`{"name": "head-npm", "package_type": "npm", "base_url": %q}`, upstream.URL)) + defer deleteRemote(t, "head-npm") + + url := apiURL("/api/v1/remote/head-npm/left-pad") + do := func(method string) (*http.Response, []byte) { + req, _ := http.NewRequest(method, url, nil) + req.Header.Set("Accept", abbreviated) + resp, err := http.DefaultClient.Do(req) + if err != nil { + t.Fatalf("%s: %v", method, err) + } + defer resp.Body.Close() + b, _ := io.ReadAll(resp.Body) + return resp, b + } + head, _ := do(http.MethodHead) + get, body := do(http.MethodGet) + if head.StatusCode != http.StatusOK || get.StatusCode != http.StatusOK { + t.Fatalf("HEAD %d, GET %d", head.StatusCode, get.StatusCode) + } + if head.ContentLength != int64(len(body)) { + t.Errorf("uncached HEAD Content-Length %d, GET body %d bytes", head.ContentLength, len(body)) + } +} + +func TestProxyHeadNonRewritingUsesUpstreamHead(t *testing.T) { + methods := make(chan string, 4) + upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + methods <- r.Method + w.Header().Set("Content-Type", "text/xml") + w.Write([]byte("")) + })) + defer upstream.Close() + + createRemote(t, mustFormat(`{"name": "head-rpm", "package_type": "rpm", "base_url": %q}`, upstream.URL)) + defer deleteRemote(t, "head-rpm") + + resp, err := http.Head(apiURL("/api/v1/remote/head-rpm/repodata/repomd.xml")) + if err != nil { + t.Fatalf("HEAD: %v", err) + } + resp.Body.Close() + if resp.StatusCode != http.StatusOK || resp.Header.Get("X-Artifact-Source") != "remote" { + t.Fatalf("HEAD %d source %q", resp.StatusCode, resp.Header.Get("X-Artifact-Source")) + } + close(methods) + var seen []string + for m := range methods { + seen = append(seen, m) + } + if len(seen) != 1 || seen[0] != http.MethodHead { + t.Errorf("upstream saw %v, want a single HEAD", seen) + } +} diff --git a/internal/api/v1/proxy.go b/internal/api/v1/proxy.go index 7429007..39c2481 100644 --- a/internal/api/v1/proxy.go +++ b/internal/api/v1/proxy.go @@ -16,6 +16,7 @@ import ( "git.unkin.net/unkin/artifactapi/internal/proxy" "git.unkin.net/unkin/artifactapi/internal/storage" "git.unkin.net/unkin/artifactapi/internal/virtual" + "git.unkin.net/unkin/artifactapi/pkg/models" ) type ProxyHandler struct { @@ -41,6 +42,7 @@ func NewProxyHandler(engine *proxy.Engine, virtualEngine *virtual.Engine, db *da func (h *ProxyHandler) Routes() chi.Router { r := chi.NewRouter() r.Get("/remote/{remoteName}/*", h.handleProxy) + r.Head("/remote/{remoteName}/*", h.handleProxyHead) r.Get("/local/{localName}/*", h.handleLocal) r.Get("/virtual/{virtualName}/*", h.handleVirtual) return r @@ -68,31 +70,43 @@ func (h *ProxyHandler) handleDockerPing(w http.ResponseWriter, r *http.Request) w.WriteHeader(http.StatusOK) } -func (h *ProxyHandler) handleProxy(w http.ResponseWriter, r *http.Request) { +// remoteFor resolves the remote and provider named in the request, writing the +// error response itself when either is missing. +func (h *ProxyHandler) remoteFor(w http.ResponseWriter, r *http.Request) (*models.Remote, provider.Provider, bool) { remoteName := chi.URLParam(r, "remoteName") - path := chi.URLParam(r, "*") - remote, err := h.db.GetRemote(r.Context(), remoteName) if err != nil { http.Error(w, fmt.Sprintf("remote %q not found", remoteName), http.StatusNotFound) - return + return nil, nil, false } - prov, err := provider.Get(remote.PackageType) if err != nil { http.Error(w, fmt.Sprintf("no provider for %q", remote.PackageType), http.StatusInternalServerError) + return nil, nil, false + } + return remote, prov, true +} + +// serveRemote lets metadata-only remotes (e.g. github_rpm) synthesize their own +// responses and redirect package downloads instead of proxying bytes. +func (h *ProxyHandler) serveRemote(w http.ResponseWriter, r *http.Request, remote *models.Remote, prov provider.Provider, path string) bool { + rs, ok := prov.(provider.RemoteServer) + return ok && rs.ServeRemote(w, r, *remote, path, fmt.Sprintf("%s://%s", scheme(r), r.Host), h.db) +} + +func (h *ProxyHandler) handleProxy(w http.ResponseWriter, r *http.Request) { + remote, prov, ok := h.remoteFor(w, r) + if !ok { return } - - // Metadata-only remotes (e.g. github_rpm) synthesize their own responses and - // redirect package downloads to a backend remote instead of proxying bytes. - if rs, ok := prov.(provider.RemoteServer); ok { - proxyBaseURL := fmt.Sprintf("%s://%s", scheme(r), r.Host) - if rs.ServeRemote(w, r, *remote, path, proxyBaseURL, h.db) { - return - } + path := chi.URLParam(r, "*") + if h.serveRemote(w, r, remote, prov, path) { + return } + h.serveFetch(w, r, remote, prov, path) +} +func (h *ProxyHandler) serveFetch(w http.ResponseWriter, r *http.Request, remote *models.Remote, prov provider.Provider, path string) { result, err := h.engine.Fetch(r.Context(), *remote, path, prov, r.Header) if err != nil { var proxyErr *proxy.ProxyError @@ -100,7 +114,7 @@ func (h *ProxyHandler) handleProxy(w http.ResponseWriter, r *http.Request) { http.Error(w, proxyErr.Message, proxyErr.Status) return } - slog.Error("proxy fetch failed", "remote", remoteName, "path", path, "error", err) + slog.Error("proxy fetch failed", "remote", remote.Name, "path", path, "error", err) http.Error(w, "bad gateway", http.StatusBadGateway) return } @@ -120,25 +134,33 @@ func (h *ProxyHandler) handleProxy(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", result.ContentType) w.Header().Set("X-Artifact-Source", result.Source) if result.Size > 0 { + w.Header().Set("Content-Length", fmt.Sprintf("%d", result.Size)) w.Header().Set("X-Artifact-Size", fmt.Sprintf("%d", result.Size)) } w.WriteHeader(http.StatusOK) io.Copy(w, body) } -func (h *ProxyHandler) handleProxyHead(w http.ResponseWriter, r *http.Request) { - remoteName := chi.URLParam(r, "remoteName") - path := chi.URLParam(r, "*") +func rewritesMutable(prov provider.Provider, path string) bool { + _, sr := prov.(provider.ServeRewriter) + _, rr := prov.(provider.ResponseRewriter) + return (sr || rr) && prov.Classify(path) == provider.Mutable +} - remote, err := h.db.GetRemote(r.Context(), remoteName) - if err != nil { - http.Error(w, fmt.Sprintf("remote %q not found", remoteName), http.StatusNotFound) +// handleProxyHead answers HEAD like GET without a body. Responses a provider +// synthesizes or rewrites per request go through the GET path so their headers +// match; everything else is answered from store metadata or an upstream HEAD. +func (h *ProxyHandler) handleProxyHead(w http.ResponseWriter, r *http.Request) { + remote, prov, ok := h.remoteFor(w, r) + if !ok { return } - - prov, err := provider.Get(remote.PackageType) - if err != nil { - http.Error(w, fmt.Sprintf("no provider for %q", remote.PackageType), http.StatusInternalServerError) + path := chi.URLParam(r, "*") + if h.serveRemote(w, r, remote, prov, path) { + return + } + if rewritesMutable(prov, path) { + h.serveFetch(w, r, remote, prov, path) return } @@ -149,7 +171,7 @@ func (h *ProxyHandler) handleProxyHead(w http.ResponseWriter, r *http.Request) { http.Error(w, proxyErr.Message, proxyErr.Status) return } - slog.Error("proxy head failed", "remote", remoteName, "path", path, "error", err) + slog.Error("proxy head failed", "remote", remote.Name, "path", path, "error", err) http.Error(w, "bad gateway", http.StatusBadGateway) return } diff --git a/internal/api/v1/routes_test.go b/internal/api/v1/routes_test.go new file mode 100644 index 0000000..e29d8cf --- /dev/null +++ b/internal/api/v1/routes_test.go @@ -0,0 +1,41 @@ +package v1 + +import ( + "net/http" + "testing" + + "github.com/go-chi/chi/v5" + + "git.unkin.net/unkin/artifactapi/internal/provider" + "git.unkin.net/unkin/artifactapi/internal/provider/npm" + "git.unkin.net/unkin/artifactapi/internal/provider/nuget" + "git.unkin.net/unkin/artifactapi/internal/provider/rpm" +) + +func TestRoutesRemoteHead(t *testing.T) { + r := (&ProxyHandler{}).Routes() + for _, m := range []string{http.MethodGet, http.MethodHead} { + if !r.Match(chi.NewRouteContext(), m, "/remote/myremote/some/path") { + t.Errorf("%s /remote/myremote/some/path not routed", m) + } + } +} + +func TestRewritesMutable(t *testing.T) { + tests := []struct { + name string + prov provider.Provider + path string + want bool + }{ + {"npm packument", &npm.Provider{}, "left-pad", true}, + {"npm tarball", &npm.Provider{}, "left-pad/-/left-pad-1.3.0.tgz", false}, + {"nuget index", &nuget.Provider{}, "index.json", true}, + {"rpm repodata", &rpm.Provider{}, "repodata/repomd.xml", false}, + } + for _, tc := range tests { + if got := rewritesMutable(tc.prov, tc.path); got != tc.want { + t.Errorf("%s: rewritesMutable = %v, want %v", tc.name, got, tc.want) + } + } +} diff --git a/internal/provider/all/gems.go b/internal/provider/all/gems.go new file mode 100644 index 0000000..ebd6ccf --- /dev/null +++ b/internal/provider/all/gems.go @@ -0,0 +1,3 @@ +package all + +import _ "git.unkin.net/unkin/artifactapi/internal/provider/gems" diff --git a/internal/provider/cap_response_rewriter.go b/internal/provider/cap_response_rewriter.go new file mode 100644 index 0000000..2c45d41 --- /dev/null +++ b/internal/provider/cap_response_rewriter.go @@ -0,0 +1,7 @@ +package provider + +// ResponseRewriter marks providers whose RewriteResponse changes mutable +// bodies, so the served length is only known after a fetch. +type ResponseRewriter interface { + RewritesResponse() +} diff --git a/internal/provider/gems/gems.go b/internal/provider/gems/gems.go new file mode 100644 index 0000000..39d324e --- /dev/null +++ b/internal/provider/gems/gems.go @@ -0,0 +1,62 @@ +// Package gems proxies a RubyGems source: mutable compact index (versions, +// info/*, names) and legacy specs indexes, plus immutable .gem and +// quick/Marshal.4.8 gemspec downloads. +package gems + +import ( + "context" + "net/http" + "strings" + + "git.unkin.net/unkin/artifactapi/internal/auth" + "git.unkin.net/unkin/artifactapi/internal/provider" + "git.unkin.net/unkin/artifactapi/pkg/models" +) + +func init() { + provider.Register(&Provider{}) +} + +type Provider struct{} + +func (p *Provider) Type() models.PackageType { return models.PackageGems } + +func (p *Provider) Classify(path string) provider.Mutability { + if isGem(path) || isQuickSpec(path) { + return provider.Immutable + } + return provider.Mutable +} + +func (p *Provider) ContentType(path string) string { + path = strings.TrimLeft(path, "/") + if path == "versions" || path == "names" || strings.HasPrefix(path, "info/") { + return "text/plain; charset=utf-8" + } + if strings.HasPrefix(path, "api/v1/") && strings.HasSuffix(path, ".json") { + return "application/json" + } + return "application/octet-stream" +} + +func (p *Provider) UpstreamURL(remote models.Remote, path string) string { + return strings.TrimRight(remote.BaseURL, "/") + "/" + strings.TrimLeft(path, "/") +} + +func (p *Provider) RewriteResponse(_ []byte, _ models.Remote, _ string) ([]byte, error) { + return nil, nil +} + +func (p *Provider) AuthHeaders(_ context.Context, remote models.Remote) (http.Header, error) { + return auth.BasicHeaders(remote), nil +} + +func isGem(path string) bool { + path = strings.TrimLeft(path, "/") + return strings.HasPrefix(path, "gems/") && strings.HasSuffix(path, ".gem") +} + +func isQuickSpec(path string) bool { + path = strings.TrimLeft(path, "/") + return strings.HasPrefix(path, "quick/Marshal.4.8/") && strings.HasSuffix(path, ".gemspec.rz") +} diff --git a/internal/provider/gems/gems_test.go b/internal/provider/gems/gems_test.go new file mode 100644 index 0000000..9707bb3 --- /dev/null +++ b/internal/provider/gems/gems_test.go @@ -0,0 +1,61 @@ +package gems + +import ( + "testing" + + "git.unkin.net/unkin/artifactapi/internal/provider" + "git.unkin.net/unkin/artifactapi/pkg/models" +) + +func TestClassify(t *testing.T) { + p := &Provider{} + tests := []struct { + path string + want provider.Mutability + }{ + {"gems/rack-3.1.8.gem", provider.Immutable}, + {"/gems/nokogiri-1.16.7-x86_64-linux.gem", provider.Immutable}, + {"quick/Marshal.4.8/rack-3.1.8.gemspec.rz", provider.Immutable}, + {"versions", provider.Mutable}, + {"names", provider.Mutable}, + {"info/rack", provider.Mutable}, + {"info/gems", provider.Mutable}, + {"specs.4.8.gz", provider.Mutable}, + {"latest_specs.4.8.gz", provider.Mutable}, + {"prerelease_specs.4.8.gz", provider.Mutable}, + {"api/v1/dependencies", provider.Mutable}, + {"quick/Marshal.4.8/", provider.Mutable}, + } + for _, tt := range tests { + if got := p.Classify(tt.path); got != tt.want { + t.Errorf("Classify(%q) = %v, want %v", tt.path, got, tt.want) + } + } +} + +func TestContentType(t *testing.T) { + p := &Provider{} + tests := map[string]string{ + "versions": "text/plain; charset=utf-8", + "info/rack": "text/plain; charset=utf-8", + "names": "text/plain; charset=utf-8", + "gems/rack-3.1.8.gem": "application/octet-stream", + "specs.4.8.gz": "application/octet-stream", + "api/v1/gems/rack.json": "application/json", + "api/v1/dependencies.json": "application/json", + "api/v1/dependencies": "application/octet-stream", + } + for path, want := range tests { + if got := p.ContentType(path); got != want { + t.Errorf("ContentType(%q) = %q, want %q", path, got, want) + } + } +} + +func TestUpstreamURL(t *testing.T) { + p := &Provider{} + r := models.Remote{BaseURL: "https://rubygems.org/"} + if got := p.UpstreamURL(r, "/info/rack"); got != "https://rubygems.org/info/rack" { + t.Errorf("UpstreamURL = %q", got) + } +} diff --git a/internal/provider/helm/helm.go b/internal/provider/helm/helm.go index 4904ff6..d421753 100644 --- a/internal/provider/helm/helm.go +++ b/internal/provider/helm/helm.go @@ -51,6 +51,8 @@ func (p *Provider) UpstreamURL(remote models.Remote, path string) string { return strings.TrimRight(remote.BaseURL, "/") + "/" + strings.TrimLeft(path, "/") } +func (p *Provider) RewritesResponse() {} + func (p *Provider) RewriteResponse(body []byte, remote models.Remote, proxyBaseURL string) ([]byte, error) { if proxyBaseURL == "" { return nil, nil diff --git a/internal/provider/npm/npm.go b/internal/provider/npm/npm.go index 38cf32d..8bc098d 100644 --- a/internal/provider/npm/npm.go +++ b/internal/provider/npm/npm.go @@ -37,6 +37,8 @@ func (p *Provider) UpstreamURL(remote models.Remote, path string) string { return strings.TrimRight(remote.BaseURL, "/") + "/" + strings.TrimLeft(path, "/") } +func (p *Provider) RewritesResponse() {} + func (p *Provider) RewriteResponse(body []byte, remote models.Remote, proxyBaseURL string) ([]byte, error) { if proxyBaseURL == "" || !json.Valid(body) { return nil, nil diff --git a/internal/provider/puppet/puppet.go b/internal/provider/puppet/puppet.go index 142a431..03bf1d8 100644 --- a/internal/provider/puppet/puppet.go +++ b/internal/provider/puppet/puppet.go @@ -39,6 +39,8 @@ func (p *Provider) UpstreamURL(remote models.Remote, path string) string { return strings.TrimRight(remote.BaseURL, "/") + "/" + strings.TrimLeft(path, "/") } +func (p *Provider) RewritesResponse() {} + func (p *Provider) RewriteResponse(body []byte, remote models.Remote, proxyBaseURL string) ([]byte, error) { if proxyBaseURL == "" { return nil, nil diff --git a/internal/provider/pypi/pypi.go b/internal/provider/pypi/pypi.go index e87e9c1..373e584 100644 --- a/internal/provider/pypi/pypi.go +++ b/internal/provider/pypi/pypi.go @@ -52,6 +52,8 @@ func (p *Provider) UpstreamURL(remote models.Remote, path string) string { return strings.TrimRight(remote.BaseURL, "/") + "/" + strings.TrimLeft(path, "/") } +func (p *Provider) RewritesResponse() {} + func (p *Provider) RewriteResponse(body []byte, remote models.Remote, proxyBaseURL string) ([]byte, error) { if proxyBaseURL == "" { return nil, nil diff --git a/internal/provider/terraform/terraform.go b/internal/provider/terraform/terraform.go index f29c33d..022d094 100644 --- a/internal/provider/terraform/terraform.go +++ b/internal/provider/terraform/terraform.go @@ -73,6 +73,8 @@ func (p *Provider) UpstreamURL(remote models.Remote, path string) string { return strings.TrimRight(remote.BaseURL, "/") + "/v1/providers/" + strings.TrimLeft(path, "/") } +func (p *Provider) RewritesResponse() {} + func (p *Provider) RewriteResponse(body []byte, remote models.Remote, proxyBaseURL string) ([]byte, error) { if remote.ReleasesRemote == "" { return nil, nil diff --git a/internal/proxy/engine.go b/internal/proxy/engine.go index 45a1b87..cc267cc 100644 --- a/internal/proxy/engine.go +++ b/internal/proxy/engine.go @@ -353,7 +353,7 @@ func (e *Engine) headUpstreamOnce(ctx context.Context, remote models.Remote, pat req.Header.Set(k, v) } } - return http.DefaultClient.Do(req) + return clientForRemote(remote).Do(req) } resp, err := doHead(nil) diff --git a/internal/proxy/engine_test.go b/internal/proxy/engine_test.go index 87ce690..2374aec 100644 --- a/internal/proxy/engine_test.go +++ b/internal/proxy/engine_test.go @@ -216,6 +216,20 @@ func TestHead(t *testing.T) { } } +func TestHeadUpstreamUsesRemoteTimeout(t *testing.T) { + slow := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + time.Sleep(3 * time.Second) + })) + defer slow.Close() + r := models.Remote{Name: "slow-head", PackageType: models.PackageGeneric, BaseURL: slow.URL, UpstreamResponseHeaderTimeout: 1} + + start := time.Now() + _, err := (&Engine{}).headUpstreamOnce(context.Background(), r, "blob.bin", prov(t, models.PackageGeneric)) + if err == nil || time.Since(start) > 2*time.Second { + t.Fatalf("HEAD ignored the remote's response header timeout: err=%v after %s", err, time.Since(start)) + } +} + func TestStaleOnError(t *testing.T) { requireStack(t) ctx := context.Background() diff --git a/pkg/models/package_type_gems.go b/pkg/models/package_type_gems.go new file mode 100644 index 0000000..58e0bd1 --- /dev/null +++ b/pkg/models/package_type_gems.go @@ -0,0 +1,5 @@ +package models + +const PackageGems PackageType = "gems" + +func init() { registerPackageType(PackageGems) } diff --git a/ui/src/packagetypes/defs/gems.ts b/ui/src/packagetypes/defs/gems.ts new file mode 100644 index 0000000..b1a8e9a --- /dev/null +++ b/ui/src/packagetypes/defs/gems.ts @@ -0,0 +1,17 @@ +import type { PackageTypeUI } from '../types'; + +const def: PackageTypeUI = { + color: 'red', + snippets: ({ proxy }) => { + return [ + { + title: 'Use this remote as the RubyGems source', + language: 'bash', + code: `gem sources --clear-all --add ${proxy}/ +bundle config mirror.https://rubygems.org ${proxy}`, + }, + ]; + }, +}; + +export default def;