Skip to content

Fix group-based message policies for Azure/Bedrock #6485

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

Draft
calvinmclean wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −6
Draft

Fix group-based message policies for Azure/Bedrock #6485

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
17 changes: 11 additions & 6 deletions pkg/gateway/server/llmproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,21 @@ func (s *Server) dispatchLLMProxy(req api.Context) error {
personalToken = true
}

// Check if the user has permission to use this model
if modelID != "" && token.UserID != "" {
userID, err := strconv.ParseUint(token.UserID, 10, 64)
// Fetch auth provider groups once for all checks that need them.
var authProviderGroups []string
if token.UserID != "" {
userIDInt, err := strconv.ParseUint(token.UserID, 10, 64)
if err != nil {
return fmt.Errorf("failed to parse user ID: %w", err)
}

// Get the user's auth provider groups
authProviderGroups, err := req.GatewayClient.ListGroupIDsForUser(req.Context(), uint(userID))
authProviderGroups, err = req.GatewayClient.ListGroupIDsForUser(req.Context(), uint(userIDInt))
if err != nil {
return fmt.Errorf("failed to get user groups: %w", err)
}
}

// Check if the user has permission to use this model
if modelID != "" && token.UserID != "" {
hasAccess, err := s.mapHelper.UserHasAccessToModel(&user.DefaultInfo{
UID: token.UserID,
Groups: token.UserGroups,
Expand Down Expand Up @@ -157,6 +159,9 @@ func (s *Server) dispatchLLMProxy(req api.Context) error {
userInfo := &user.DefaultInfo{
UID: token.UserID,
Groups: token.UserGroups,
Extra: map[string][]string{
"auth_provider_groups": authProviderGroups,
},
}
outputPolicies, conversationHistory, inputPolicyReplacement, err = applyMessagePolicies(
req.Context(), messagePolicyHelper, userInfo, req.GatewayClient, body, token.ProjectID, token.ThreadID,
Expand Down
Loading