Skip to content

fix: scope cache keys to a workspace to prevent leaking of data #3633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flo4604 merged 1 commit into from
Jul 21, 2025
Merged

fix: scope cache keys to a workspace to prevent leaking of data #3633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions go/apps/api/routes/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,48 +73,48 @@ func Register(srv *zen.Server, svc *Services) {
srv.RegisterRoute(
defaultMiddlewares,
&v2RatelimitLimit.Handler{
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
ClickHouse: svc.ClickHouse,
Ratelimit: svc.Ratelimit,
RatelimitNamespaceByNameCache: svc.Caches.RatelimitNamespaceByName,
TestMode: srv.Flags().TestMode,
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
ClickHouse: svc.ClickHouse,
Ratelimit: svc.Ratelimit,
RatelimitNamespaceCache: svc.Caches.RatelimitNamespace,
TestMode: srv.Flags().TestMode,
},
)

// v2/ratelimit.setOverride
srv.RegisterRoute(
defaultMiddlewares,
&v2RatelimitSetOverride.Handler{
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
Auditlogs: svc.Auditlogs,
RatelimitNamespaceByNameCache: svc.Caches.RatelimitNamespaceByName,
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
Auditlogs: svc.Auditlogs,
RatelimitNamespaceCache: svc.Caches.RatelimitNamespace,
},
)

// v2/ratelimit.getOverride
srv.RegisterRoute(
defaultMiddlewares,
&v2RatelimitGetOverride.Handler{
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
RatelimitNamespaceByNameCache: svc.Caches.RatelimitNamespaceByName,
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
RatelimitNamespaceCache: svc.Caches.RatelimitNamespace,
},
)

// v2/ratelimit.deleteOverride
srv.RegisterRoute(
defaultMiddlewares,
&v2RatelimitDeleteOverride.Handler{
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
Auditlogs: svc.Auditlogs,
RatelimitNamespaceByNameCache: svc.Caches.RatelimitNamespaceByName,
Logger: svc.Logger,
DB: svc.Database,
Keys: svc.Keys,
Auditlogs: svc.Auditlogs,
RatelimitNamespaceCache: svc.Caches.RatelimitNamespace,
},
)

Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_delete_override/200_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ func TestDeleteOverrideSuccessfully(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_delete_override/400_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ func TestBadRequests(t *testing.T) {

rootKey := h.CreateRootKey(h.Resources().UserWorkspace.ID)
route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_delete_override/401_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ func TestUnauthorizedAccess(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_delete_override/403_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ func TestWorkspacePermissions(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_delete_override/404_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ func TestNotFound(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Auditlogs: h.Auditlogs,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
21 changes: 15 additions & 6 deletions go/apps/api/routes/v2_ratelimit_delete_override/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ type Response = openapi.V2RatelimitDeleteOverrideResponseBody

// Handler implements zen.Route interface for the v2 ratelimit delete override endpoint
type Handler struct {
Logger logging.Logger
DB db.Database
Keys keys.KeyService
Auditlogs auditlogs.AuditLogService
RatelimitNamespaceByNameCache cache.Cache[string, db.FindRatelimitNamespace]
Logger logging.Logger
DB db.Database
Keys keys.KeyService
Auditlogs auditlogs.AuditLogService
RatelimitNamespaceCache cache.Cache[cache.ScopedKey, db.FindRatelimitNamespace]
}

// Method returns the HTTP method this route responds to
Expand Down Expand Up @@ -156,7 +156,16 @@ func (h *Handler) Handle(ctx context.Context, s *zen.Session) error {
return err
}

h.RatelimitNamespaceByNameCache.Remove(ctx, namespace.Name)
h.RatelimitNamespaceCache.Remove(ctx,
cache.ScopedKey{
WorkspaceID: auth.AuthorizedWorkspaceID,
Key: namespace.ID,
},
cache.ScopedKey{
WorkspaceID: auth.AuthorizedWorkspaceID,
Key: namespace.Name,
},
)

return nil
})
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/200_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ func TestGetOverrideSuccessfully(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/400_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ func TestBadRequests(t *testing.T) {

rootKey := h.CreateRootKey(h.Resources().UserWorkspace.ID)
route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/401_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ func TestUnauthorizedAccess(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/403_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ func TestWorkspacePermissions(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/404_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ func TestOverrideNotFound(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
8 changes: 4 additions & 4 deletions go/apps/api/routes/v2_ratelimit_get_override/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ type Response = openapi.V2RatelimitGetOverrideResponseBody
// Handler implements zen.Route interface for the v2 ratelimit get override endpoint
type Handler struct {
// Services as public fields
Logger logging.Logger
DB db.Database
Keys keys.KeyService
RatelimitNamespaceByNameCache cache.Cache[string, db.FindRatelimitNamespace]
Logger logging.Logger
DB db.Database
Keys keys.KeyService
RatelimitNamespaceCache cache.Cache[cache.ScopedKey, db.FindRatelimitNamespace]
}

// Method returns the HTTP method this route responds to
Expand Down
12 changes: 6 additions & 6 deletions go/apps/api/routes/v2_ratelimit_limit/200_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ func TestLimitSuccessfully(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
ClickHouse: h.ClickHouse,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
ClickHouse: h.ClickHouse,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_limit/400_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ func TestBadRequests(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_limit/401_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ func TestUnauthorizedAccess(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_limit/403_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ func TestWorkspacePermissions(t *testing.T) {
require.NoError(t, err)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
10 changes: 5 additions & 5 deletions go/apps/api/routes/v2_ratelimit_limit/404_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ func TestNamespaceNotFound(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}

h.Register(route)
Expand Down
12 changes: 6 additions & 6 deletions go/apps/api/routes/v2_ratelimit_limit/accuracy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ func TestRateLimitAccuracy(t *testing.T) {
h := testutil.NewHarness(t)

route := &handler.Handler{
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
ClickHouse: h.ClickHouse,
Ratelimit: h.Ratelimit,
RatelimitNamespaceByNameCache: h.Caches.RatelimitNamespaceByName,
DB: h.DB,
Keys: h.Keys,
Logger: h.Logger,
ClickHouse: h.ClickHouse,
Ratelimit: h.Ratelimit,
RatelimitNamespaceCache: h.Caches.RatelimitNamespace,
}
h.Register(route)
ctx := context.Background()
Expand Down
Loading