Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: derive access grant creator from the authenticated caller (#20956)

Danny Xu32b954b853c1
diff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.go
index 68fe3dc23a..facd4ea9a1 100644
--- a/backend/api/v1/access_grant_service.go
+++ b/backend/api/v1/access_grant_service.go
@@ -137,9 +137,6 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
if ag == nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("access_grant is required"))
}
- if ag.Creator == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("creator is required"))
- }
if len(ag.Targets) == 0 {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("targets is required"))
}
@@ -169,10 +166,14 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("only read-only statements are allowed in access grants"))
}
- creatorEmail, err := common.GetUserEmail(ag.Creator)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid creator"))
+ // Derive the creator from the authenticated caller. The client-supplied
+ // creator field is OUTPUT_ONLY and must never be trusted, otherwise any
+ // caller could forge grants and issues attributed to an arbitrary identity.
+ user, ok := GetUserFromContext(ctx)
+ if !ok || user == nil {
+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.New("user not found"))
}
+ creatorEmail := user.Email
var expireTime *time.Time
var requestedDuration *durationpb.Duration
diff --git a/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.tsx b/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.tsx
index fe50af4c4e..ceeee4396f 100644
--- a/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.tsx
+++ b/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.tsx
@@ -30,7 +30,6 @@ import {
SheetTitle,
} from "@/components/ui/sheet";
import { Textarea } from "@/components/ui/textarea";
-import { useCurrentUser } from "@/hooks/useAppState";
import {
monacoThemeName,
themeColorScheme,
@@ -70,7 +69,6 @@ function AccessGrantRequestDrawerInner({
onClose,
}: AccessGrantRequestDrawerInnerProps) {
const { t } = useTranslation();
- const currentUserEmail = useCurrentUser().email;
const setAsidePanelTab = useSQLEditorStore((s) => s.setAsidePanelTab);
const setHighlightAccessGrantName = useSQLEditorStore(
(s) => s.setHighlightAccessGrantName
@@ -253,7 +251,6 @@ function AccessGrantRequestDrawerInner({
};
const accessGrant = create(AccessGrantSchema, {
- creator: `users/${currentUserEmail}`,
targets,
query,
unmask,