diff --git a/malwaredb/license.go b/malwaredb/license.go index b516e93..b483ced 100644 --- a/malwaredb/license.go +++ b/malwaredb/license.go @@ -5,13 +5,15 @@ import ( "common/settings" "common/token" "net/url" + "os" "strings" "time" ) // LicenseHeader is the X-Nvm-License value for feed GETs. // Certified builds may send a real AccessToken via mirrorauth. -// Community builds mint a short-lived temporary token. +// Pack/CI can inject NVM_ACCESS_TOKEN or NVM_LICENSE for seed fetches. +// Community runtime falls back to a short-lived temporary token. func LicenseHeader() string { head, err := url.Parse(DefaultFeedBase + "/v1/head.cose") if err == nil { @@ -24,6 +26,13 @@ func LicenseHeader() string { } } } + // Pack/CI seed fetches set NVM_ACCESS_TOKEN before any installed AccessToken. + if env := strings.TrimSpace(os.Getenv("NVM_ACCESS_TOKEN")); env != "" { + return strings.TrimPrefix(env, "Bearer ") + } + if env := strings.TrimSpace(os.Getenv("NVM_LICENSE")); env != "" { + return strings.TrimPrefix(env, "Bearer ") + } access := strings.TrimSpace(settings.Global().AccessToken) access = strings.TrimPrefix(access, "Bearer ") if access != "" { diff --git a/malwaredb/license_test.go b/malwaredb/license_test.go new file mode 100644 index 0000000..999ea71 --- /dev/null +++ b/malwaredb/license_test.go @@ -0,0 +1,30 @@ +package malwaredb + +import ( + "os" + "testing" +) + +func TestLicenseHeaderPrefersEnvToken(t *testing.T) { + t.Setenv("NVM_ACCESS_TOKEN", "") + t.Setenv("NVM_LICENSE", "") + prev := LicenseHeader() + if prev == "" { + t.Fatal("LicenseHeader() empty without env; want temporary token") + } + + t.Setenv("NVM_ACCESS_TOKEN", "Bearer pack-time-token") + got := LicenseHeader() + if got != "pack-time-token" { + t.Fatalf("LicenseHeader() = %q, want pack-time-token", got) + } + + t.Setenv("NVM_ACCESS_TOKEN", "") + t.Setenv("NVM_LICENSE", "env-license") + got = LicenseHeader() + if got != "env-license" { + t.Fatalf("LicenseHeader() = %q, want env-license", got) + } + + _ = os.Unsetenv("NVM_LICENSE") +}