feat(docker-reverse-proxy): gate access token auth behind feature flag #3242
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,14 +14,16 @@ | |
| "github.com/e2b-dev/infra/packages/db/pkg/pool" | ||
| "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/cache" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/consts" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/featureflags" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/utils" | ||
| ) | ||
|
|
||
| type APIStore struct { | ||
| db *client.Client | ||
| authDb *authdb.Client | ||
| AuthCache *cache.AuthCache | ||
| proxy *httputil.ReverseProxy | ||
| featureFlags *featureflags.Client | ||
| } | ||
|
|
||
| func NewStore(ctx context.Context) *APIStore { | ||
|
|
@@ -38,6 +40,11 @@ | |
| log.Fatal(err) | ||
| } | ||
|
|
||
| featureFlags, err := featureflags.NewClient() | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
Check failure on line 46 in packages/docker-reverse-proxy/internal/handlers/store.go
|
||
|
There was a problem hiding this comment. LaunchDarkly unset in deploymentHigh Severity
  Reviewed by Cursor Bugbot for commit a5ba40d. Configure here.
Comment on lines
+43
to
+46
There was a problem hiding this comment. 🔴 The Nomad job for docker-reverse-proxy is missing Extended reasoning...What breaksThis PR wires a LaunchDarkly-backed gate into Code path
Step-by-step proof
Why existing code doesn't prevent it
FixOne-line addition to docker_reverse_proxy_env_vars = merge({
POSTGRES_CONNECTION_STRING = ...
# ...
DOMAIN_NAME = var.domain_name
LAUNCH_DARKLY_API_KEY = trimspace(data.google_secret_manager_secret_version.launch_darkly_api_key.secret_data)
}, var.docker_reverse_proxy_env_vars)Also worth auditing any other deployment providers (AWS self-host) for the same omission, since this is a new dependency for docker-reverse-proxy. |
||
|
|
||
| targetUrl := &url.URL{ | ||
| Scheme: "https", | ||
| Host: fmt.Sprintf("%s-docker.pkg.dev", consts.GCPRegion), | ||
|
|
@@ -57,10 +64,11 @@ | |
| } | ||
|
|
||
| return &APIStore{ | ||
| db: database, | ||
| authDb: authDatabase, | ||
| AuthCache: authCache, | ||
| proxy: proxy, | ||
| featureFlags: featureFlags, | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package handlers | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "fmt" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/google/uuid" | ||
| "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldtestdata" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries" | ||
| "github.com/e2b-dev/infra/packages/db/pkg/testutils" | ||
| "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/cache" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/featureflags" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/keys" | ||
| ) | ||
|
|
||
| func newTokenTestStore(t *testing.T, accessTokenAuthDisabled bool) (*APIStore, keys.Key) { | ||
| t.Helper() | ||
|
|
||
| td := ldtestdata.DataSource() | ||
| td.Update(td.Flag(featureflags.DisableE2BAccessTokenAuthFlag.Key()).VariationForAll(accessTokenAuthDisabled)) | ||
| ff, err := featureflags.NewClientWithDatasource(td) | ||
| require.NoError(t, err) | ||
| t.Cleanup(func() { _ = ff.Close(t.Context()) }) | ||
|
|
||
| db := testutils.SetupDatabase(t) | ||
|
|
||
| accessToken, err := keys.GenerateKey(keys.AccessTokenPrefix) | ||
| require.NoError(t, err) | ||
|
|
||
| userID := uuid.New() | ||
| require.NoError(t, db.AuthDB.Write.UpsertPublicUser(t.Context(), userID)) | ||
|
|
||
| _, err = db.AuthDB.Write.CreateAccessToken(t.Context(), authqueries.CreateAccessTokenParams{ | ||
| ID: uuid.New(), | ||
| UserID: userID, | ||
| AccessTokenHash: accessToken.HashedValue, | ||
| AccessTokenPrefix: accessToken.Masked.Prefix, | ||
| AccessTokenLength: int32(accessToken.Masked.ValueLength), | ||
| AccessTokenMaskPrefix: accessToken.Masked.MaskedValuePrefix, | ||
| AccessTokenMaskSuffix: accessToken.Masked.MaskedValueSuffix, | ||
| Name: "Test token", | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| return &APIStore{ | ||
| db: db.SqlcClient, | ||
| authDb: db.AuthDB, | ||
| AuthCache: cache.New(), | ||
| featureFlags: ff, | ||
| }, accessToken | ||
| } | ||
|
|
||
| func newTokenRequest(t *testing.T, rawAccessToken string) *http.Request { | ||
| t.Helper() | ||
|
|
||
| req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/v2/token", nil) | ||
| loginInfo := base64.StdEncoding.EncodeToString(fmt.Appendf(nil, "_e2b_access_token:%s", rawAccessToken)) | ||
| req.Header.Set("Authorization", "Basic "+loginInfo) | ||
|
|
||
| return req | ||
| } | ||
|
|
||
| func TestGetTokenAcceptsAccessTokenWhenAuthEnabled(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| store, accessToken := newTokenTestStore(t, false) | ||
|
|
||
| recorder := httptest.NewRecorder() | ||
| err := store.GetToken(recorder, newTokenRequest(t, accessToken.PrefixedRawValue)) | ||
|
|
||
| require.NoError(t, err) | ||
| require.Equal(t, http.StatusOK, recorder.Code) | ||
| require.Contains(t, recorder.Body.String(), "token") | ||
| } | ||
|
|
||
| func TestGetTokenRejectsAccessTokenWhenAuthDisabled(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| store, accessToken := newTokenTestStore(t, true) | ||
|
|
||
| recorder := httptest.NewRecorder() | ||
| err := store.GetToken(recorder, newTokenRequest(t, accessToken.PrefixedRawValue)) | ||
|
|
||
| require.Error(t, err) | ||
| require.Equal(t, http.StatusForbidden, recorder.Code) | ||
| require.Contains(t, recorder.Body.String(), "E2B_API_KEY") | ||
| require.Contains(t, recorder.Body.String(), "https://e2b.dev/docs/migration/access-token-deprecation") | ||
| } | ||
|
|
||
| func TestGetTokenRejectsInvalidAccessTokenRegardlessOfFlag(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| store, _ := newTokenTestStore(t, true) | ||
|
|
||
| recorder := httptest.NewRecorder() | ||
| err := store.GetToken(recorder, newTokenRequest(t, keys.AccessTokenPrefix+"invalid")) | ||
|
|
||
| require.Error(t, err) | ||
| require.Equal(t, http.StatusForbidden, recorder.Code) | ||
| require.Contains(t, recorder.Body.String(), "invalid access token") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the GCP Nomad config I checked,
docker_reverse_proxy_env_varsonly passes the Postgres/Google/GCP/domain values (iac/provider-gcp/main.tf:188-195), whileNewClient()falls back to the offline datasource wheneverLAUNCH_DARKLY_API_KEYis empty (packages/shared/pkg/featureflags/client.go:58-61). Since this commit creates the LD client here but does not wire that env var into the docker-reverse-proxy job, deployed proxy instances will always evaluatedisable-e2b-access-token-authas its defaultfalseand will continue accepting deprecated access-token logins even when the flag is enabled.Useful? React with 👍 / 👎.