Skip to content

feat(authz): add multi group claims support #2984

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

Open
jrschumacher wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(authz): add multi group claims support #2984

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
34 changes: 5 additions & 29 deletions service/internal/auth/authn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

"github.com/opentdf/platform/service/logger"
"github.com/opentdf/platform/service/logger/audit"
"google.golang.org/grpc/metadata"

ctxAuth "github.com/opentdf/platform/service/pkg/auth"
"github.com/opentdf/platform/service/pkg/util"
"google.golang.org/grpc/metadata"
)

var (
Expand Down Expand Up @@ -277,20 +277,7 @@ func (a Authentication) MuxHandler(handler http.Handler) http.Handler {
default:
action = ActionUnsafe
}
if allow, err := a.enforcer.Enforce(accessTok, r.URL.Path, action); err != nil {
if err.Error() == "permission denied" {
log.WarnContext(
ctx,
"permission denied",
slog.String("azp", accessTok.Subject()),
slog.Any("error", err),
)
http.Error(w, "permission denied", http.StatusForbidden)
return
}
http.Error(w, "internal server error", http.StatusInternalServerError)
return
} else if !allow {
if !a.enforcer.Enforce(accessTok, nil, r.URL.Path, action) {
log.WarnContext(
ctx,
"permission denied",
Expand Down Expand Up @@ -367,18 +354,7 @@ func (a Authentication) ConnectUnaryServerInterceptor() connect.UnaryInterceptor
}

// Check if the token is allowed to access the resource
if allowed, err := a.enforcer.Enforce(token, resource, action); err != nil {
if err.Error() == "permission denied" {
log.WarnContext(
ctxWithJWK,
"permission denied",
slog.String("azp", token.Subject()),
slog.Any("error", err),
)
return nil, connect.NewError(connect.CodePermissionDenied, errors.New("permission denied"))
}
return nil, err
} else if !allowed {
if !a.enforcer.Enforce(token, nil, resource, action) {
log.WarnContext(ctxWithJWK, "permission denied", slog.String("azp", token.Subject()))
return nil, connect.NewError(connect.CodePermissionDenied, errors.New("permission denied"))
}
Expand Down Expand Up @@ -786,7 +762,7 @@ func (a *Authentication) getClientIDFromToken(ctx context.Context, tok jwt.Token
if err != nil {
return "", fmt.Errorf("failed to parse token as a map and find claim at [%s]: %w", clientIDClaim, err)
}
found := dotNotation(claimsMap, clientIDClaim)
found := util.Dotnotation(claimsMap, clientIDClaim)
if found == nil {
return "", fmt.Errorf("%w at [%s]", ErrClientIDClaimNotFound, clientIDClaim)
}
Expand Down
Loading
Loading