From 84f3f59c7a6277c62676355cdc34dc9082cde6fd Mon Sep 17 00:00:00 2001 From: lubien Date: Wed, 2 Jul 2025 08:22:19 -0300 Subject: [PATCH 1/3] ALLOW_THIRD_PARTY_ORG_SLUG for building across orgs --- dockerproxy/auth.go | 5 +++++ dockerproxy/main.go | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dockerproxy/auth.go b/dockerproxy/auth.go index 04aede0..074a595 100644 --- a/dockerproxy/auth.go +++ b/dockerproxy/auth.go @@ -72,6 +72,11 @@ func authorizeRequest(ctx context.Context, appName, authToken string) bool { return true } + if allowThirdPartyOrgSlug == app.Organization.Slug { + log.Warnf("Allowed %s from third party organization %s", appName, app.Organization.Slug) + return true + } + builderAppName, ok := os.LookupEnv("FLY_APP_NAME") if !ok { log.Warn("FLY_APP_NAME env var is not set!") diff --git a/dockerproxy/main.go b/dockerproxy/main.go index 200389d..6c49f74 100644 --- a/dockerproxy/main.go +++ b/dockerproxy/main.go @@ -38,11 +38,12 @@ var ( pruneThresholdFreeBytes = 15 * 1000 * 1000 * 1000 // dev and testing - noDockerd = os.Getenv("NO_DOCKERD") == "1" - noAuth = os.Getenv("NO_AUTH") == "1" - noAppName = os.Getenv("NO_APP_NAME") == "1" - noHttps = os.Getenv("NO_HTTPS") == "1" - noFilter = true + noDockerd = os.Getenv("NO_DOCKERD") == "1" + noAuth = os.Getenv("NO_AUTH") == "1" + noAppName = os.Getenv("NO_APP_NAME") == "1" + noHttps = os.Getenv("NO_HTTPS") == "1" + allowThirdPartyOrgSlug = os.Getenv("ALLOW_THIRD_PARTY_ORG_SLUG") + noFilter = true // build variables gitSha string From e027b263cdcf3076ee7c1c7048dded159fbe46a3 Mon Sep 17 00:00:00 2001 From: lubien Date: Wed, 2 Jul 2025 09:48:30 -0300 Subject: [PATCH 2/3] tmp log --- dockerproxy/auth.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerproxy/auth.go b/dockerproxy/auth.go index 074a595..ddd16e7 100644 --- a/dockerproxy/auth.go +++ b/dockerproxy/auth.go @@ -72,6 +72,8 @@ func authorizeRequest(ctx context.Context, appName, authToken string) bool { return true } + log.Warnf("allowThirdPartyOrgSlug %s", allowThirdPartyOrgSlug) + log.Warnf("org slug %s", app.Organization.Slug) if allowThirdPartyOrgSlug == app.Organization.Slug { log.Warnf("Allowed %s from third party organization %s", appName, app.Organization.Slug) return true From 243f33a54eabaafc421c54aeb914737a0aba33b1 Mon Sep 17 00:00:00 2001 From: lubien Date: Thu, 3 Jul 2025 08:58:31 -0300 Subject: [PATCH 3/3] remove logs --- dockerproxy/auth.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerproxy/auth.go b/dockerproxy/auth.go index ddd16e7..074a595 100644 --- a/dockerproxy/auth.go +++ b/dockerproxy/auth.go @@ -72,8 +72,6 @@ func authorizeRequest(ctx context.Context, appName, authToken string) bool { return true } - log.Warnf("allowThirdPartyOrgSlug %s", allowThirdPartyOrgSlug) - log.Warnf("org slug %s", app.Organization.Slug) if allowThirdPartyOrgSlug == app.Organization.Slug { log.Warnf("Allowed %s from third party organization %s", appName, app.Organization.Slug) return true