Boundary OIDC method does not currently support passing in prompts during authentication. This change adds the capability of passing OIDC prompts. Prompts are optional OIDC parameters that determine the behaviour of the authentication server: https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest ## Changes - New `auth_oidc_prompt` table which contains all the prompts for OIDC auth method - New `auth_oidc_prompt_enm` table which contains possible enum values for a prompt - Currently supported: - `none`: The Authorization Server MUST NOT display any authentication or consent user interface pages - `login`: The Authorization Server SHOULD prompt the End-User for reauthentication - `consent`: The Authorization Server SHOULD prompt the End-User for consent before returning information to the Client - `select_account`: The Authorization Server SHOULD prompt the End-User to select a user account - `oidc_auth_method_with_value_obj` view has been updated to return `prompt` value - Add `prompt` option for OIDC auth method CLI create and update - Pass configured prompt during OIDC authentication - Add `prompt` API validation for create and update
209 lines
7.6 KiB
Go
209 lines
7.6 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package oidc
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/boundary/internal/db"
|
|
"github.com/hashicorp/boundary/internal/db/timestamp"
|
|
"github.com/hashicorp/boundary/internal/errors"
|
|
"github.com/hashicorp/boundary/internal/kms"
|
|
"github.com/hashicorp/go-kms-wrapping/v2/extras/structwrapping"
|
|
)
|
|
|
|
// LookupAuthMethod will lookup an auth method in the repo, along with its
|
|
// associated Value Objects of SigningAlgs, CallbackUrls, AudClaims and
|
|
// Certificates. If it's not found, it will return nil, nil. The
|
|
// WithUnauthenticatedUser options is supported and all other options are
|
|
// ignored.
|
|
func (r *Repository) LookupAuthMethod(ctx context.Context, publicId string, opt ...Option) (*AuthMethod, error) {
|
|
const op = "oidc.(Repository).LookupAuthMethod"
|
|
if publicId == "" {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "missing public id")
|
|
}
|
|
opts := getOpts(opt...)
|
|
return r.lookupAuthMethod(ctx, publicId, WithUnauthenticatedUser(opts.withUnauthenticatedUser))
|
|
}
|
|
|
|
// ListAuthMethods returns a slice of AuthMethods for the scopeId. The
|
|
// WithUnauthenticatedUser, WithLimit and WithOrder options are supported and
|
|
// all other options are ignored.
|
|
func (r *Repository) ListAuthMethods(ctx context.Context, scopeIds []string, opt ...Option) ([]*AuthMethod, error) {
|
|
const op = "oidc.(Repository).ListAuthMethods"
|
|
if len(scopeIds) == 0 {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "missing scope IDs")
|
|
}
|
|
authMethods, err := r.getAuthMethods(ctx, "", scopeIds, opt...)
|
|
if err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
return authMethods, nil
|
|
}
|
|
|
|
// lookupAuthMethod will lookup a single auth method
|
|
func (r *Repository) lookupAuthMethod(ctx context.Context, authMethodId string, opt ...Option) (*AuthMethod, error) {
|
|
const op = "oidc.(Repository).lookupAuthMethod"
|
|
var err error
|
|
ams, err := r.getAuthMethods(ctx, authMethodId, nil, opt...)
|
|
if err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
switch {
|
|
case len(ams) == 0:
|
|
return nil, nil // not an error to return no rows for a "lookup"
|
|
case len(ams) > 1:
|
|
return nil, errors.New(ctx, errors.NotSpecificIntegrity, op, fmt.Sprintf("%s matched more than 1 ", authMethodId))
|
|
default:
|
|
return ams[0], nil
|
|
}
|
|
}
|
|
|
|
// getAuthMethods allows the caller to either lookup a specific AuthMethod via
|
|
// its id or search for a set AuthMethods within a set of scopes. Passing both
|
|
// scopeIds and a authMethod is an error. The WithUnauthenticatedUser,
|
|
// WithLimit and WithOrder options are supported and all other options are
|
|
// ignored.
|
|
//
|
|
// The AuthMethod returned has its value objects populated (SigningAlgs,
|
|
// CallbackUrls, AudClaims and Certificates). The AuthMethod returned has its
|
|
// IsPrimaryAuthMethod bool set.
|
|
//
|
|
// When no record is found it returns nil, nil
|
|
func (r *Repository) getAuthMethods(ctx context.Context, authMethodId string, scopeIds []string, opt ...Option) ([]*AuthMethod, error) {
|
|
const op = "oidc.(Repository).getAuthMethods"
|
|
if authMethodId == "" && len(scopeIds) == 0 {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "missing search criteria: both auth method id and Scope IDs are empty")
|
|
}
|
|
if authMethodId != "" && len(scopeIds) > 0 {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "searching for both an auth method id and Scope IDs is not supported")
|
|
}
|
|
|
|
const aggregateDelimiter = "|"
|
|
|
|
dbArgs := []db.Option{}
|
|
opts := getOpts(opt...)
|
|
limit := r.defaultLimit
|
|
if opts.withLimit != 0 {
|
|
// non-zero signals an override of the default limit for the repo.
|
|
limit = opts.withLimit
|
|
}
|
|
dbArgs = append(dbArgs, db.WithLimit(limit))
|
|
|
|
if opts.withOrderByCreateTime {
|
|
if opts.ascending {
|
|
dbArgs = append(dbArgs, db.WithOrder("create_time asc"))
|
|
} else {
|
|
dbArgs = append(dbArgs, db.WithOrder("create_time"))
|
|
}
|
|
}
|
|
|
|
var args []any
|
|
var where []string
|
|
switch {
|
|
case authMethodId != "":
|
|
where, args = append(where, "public_id = ?"), append(args, authMethodId)
|
|
default:
|
|
where, args = append(where, "scope_id in(?)"), append(args, scopeIds)
|
|
}
|
|
|
|
if opts.withUnauthenticatedUser {
|
|
where, args = append(where, "state = ?"), append(args, string(ActivePublicState))
|
|
}
|
|
|
|
var aggAuthMethods []*authMethodAgg
|
|
err := r.reader.SearchWhere(ctx, &aggAuthMethods, strings.Join(where, " and "), args, dbArgs...)
|
|
if err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
|
|
if len(aggAuthMethods) == 0 { // we're done if nothing is found.
|
|
return nil, nil
|
|
}
|
|
|
|
authMethods := make([]*AuthMethod, 0, len(aggAuthMethods))
|
|
for _, agg := range aggAuthMethods {
|
|
databaseWrapper, err := r.kms.GetWrapper(ctx, agg.ScopeId, kms.KeyPurposeDatabase, kms.WithKeyId(agg.KeyId))
|
|
if err != nil {
|
|
return nil, errors.Wrap(ctx, err, op, errors.WithMsg("unable to get database wrapper"))
|
|
}
|
|
if err := structwrapping.UnwrapStruct(ctx, databaseWrapper, agg, nil); err != nil {
|
|
return nil, errors.Wrap(ctx, err, op, errors.WithCode(errors.Decrypt))
|
|
}
|
|
am := AllocAuthMethod()
|
|
am.PublicId = agg.PublicId
|
|
am.ScopeId = agg.ScopeId
|
|
am.IsPrimaryAuthMethod = agg.IsPrimaryAuthMethod
|
|
am.Name = agg.Name
|
|
am.Description = agg.Description
|
|
am.CreateTime = agg.CreateTime
|
|
am.UpdateTime = agg.UpdateTime
|
|
am.Version = agg.Version
|
|
am.OperationalState = agg.State
|
|
am.DisableDiscoveredConfigValidation = agg.DisableDiscoveredConfigValidation
|
|
am.Issuer = agg.Issuer
|
|
am.ClientId = agg.ClientId
|
|
am.CtClientSecret = agg.CtClientSecret
|
|
am.ClientSecret = agg.ClientSecret
|
|
am.ClientSecretHmac = agg.ClientSecretHmac
|
|
am.KeyId = agg.KeyId
|
|
am.MaxAge = int32(agg.MaxAge)
|
|
am.ApiUrl = agg.ApiUrl
|
|
if agg.Algs != "" {
|
|
am.SigningAlgs = strings.Split(agg.Algs, aggregateDelimiter)
|
|
}
|
|
if agg.Auds != "" {
|
|
am.AudClaims = strings.Split(agg.Auds, aggregateDelimiter)
|
|
}
|
|
if agg.Certs != "" {
|
|
am.Certificates = strings.Split(agg.Certs, aggregateDelimiter)
|
|
}
|
|
if agg.ClaimsScopes != "" {
|
|
am.ClaimsScopes = strings.Split(agg.ClaimsScopes, aggregateDelimiter)
|
|
}
|
|
if agg.AccountClaimMaps != "" {
|
|
am.AccountClaimMaps = strings.Split(agg.AccountClaimMaps, aggregateDelimiter)
|
|
}
|
|
if agg.Prompts != "" {
|
|
am.Prompts = strings.Split(agg.Prompts, aggregateDelimiter)
|
|
}
|
|
authMethods = append(authMethods, &am)
|
|
}
|
|
return authMethods, nil
|
|
}
|
|
|
|
// authMethodAgg is a view that aggregates the auth method's value objects in to
|
|
// string fields delimited with the aggregateDelimiter of "|"
|
|
type authMethodAgg struct {
|
|
PublicId string `gorm:"primary_key"`
|
|
ScopeId string
|
|
IsPrimaryAuthMethod bool
|
|
Name string
|
|
Description string
|
|
CreateTime *timestamp.Timestamp
|
|
UpdateTime *timestamp.Timestamp
|
|
Version uint32
|
|
State string
|
|
DisableDiscoveredConfigValidation bool
|
|
Issuer string
|
|
ClientId string
|
|
CtClientSecret []byte `gorm:"column:client_secret;not_null" wrapping:"ct,client_secret"`
|
|
ClientSecret string `gorm:"-" wrapping:"pt,client_secret"`
|
|
ClientSecretHmac string
|
|
KeyId string
|
|
MaxAge int
|
|
Algs string
|
|
ApiUrl string
|
|
Auds string
|
|
Certs string
|
|
ClaimsScopes string
|
|
AccountClaimMaps string
|
|
Prompts string
|
|
}
|
|
|
|
// TableName returns the table name for gorm
|
|
func (agg *authMethodAgg) TableName() string { return "oidc_auth_method_with_value_obj" }
|