diff --git a/changelog/15552.txt b/changelog/15552.txt new file mode 100644 index 000000000..22d854bc5 --- /dev/null +++ b/changelog/15552.txt @@ -0,0 +1,6 @@ +```release-note:bug +openapi: Fixed issue where information about /auth/token endpoints was not present with explicit policy permissions +``` +```release-note:bug +api: Fixed issue with internal/ui/mounts and internal/ui/mounts/(?P.+) endpoints where it was not properly handling /auth/ +``` \ No newline at end of file diff --git a/vault/logical_system.go b/vault/logical_system.go index 63febcd89..920a3a402 100644 --- a/vault/logical_system.go +++ b/vault/logical_system.go @@ -3734,7 +3734,11 @@ func (b *SystemBackend) pathInternalUIMountsRead(ctx context.Context, req *logic } if isAuthed { - return hasMountAccess(ctx, acl, me.Namespace().Path+me.Path) + if me.Table == "auth" { + return hasMountAccess(ctx, acl, me.Namespace().Path+me.Table+"/"+me.Path) + } else { + return hasMountAccess(ctx, acl, me.Namespace().Path+me.Path) + } } return false @@ -3844,10 +3848,18 @@ func (b *SystemBackend) pathInternalUIMountRead(ctx context.Context, req *logica } resp.Data["path"] = me.Path - fullMountPath := ns.Path + me.Path + pathWithTable := "" + + if me.Table == "auth" { + pathWithTable = me.Table + "/" + me.Path + } else { + pathWithTable = me.Path + } + + fullMountPath := ns.Path + pathWithTable if ns.ID != me.Namespace().ID { - resp.Data["path"] = me.Namespace().Path + me.Path - fullMountPath = ns.Path + me.Namespace().Path + me.Path + resp.Data["path"] = me.Namespace().Path + pathWithTable + fullMountPath = ns.Path + me.Namespace().Path + pathWithTable } if !hasMountAccess(ctx, acl, fullMountPath) {