Add OAuth2 API scope registration and enforcement
Register v1 API scopes in coredata, advertise them in OIDC discovery and protected-resource metadata, show them on the consent screen, and enforce scope-to-action mapping in the IAM Authorizer before policy evaluation. Signed-off-by: Ludovic Vielle <ludovic@probo.com>
This commit is contained in:
@@ -27,32 +27,12 @@ type (
|
||||
OAuth2Scopes []OAuth2Scope
|
||||
)
|
||||
|
||||
const (
|
||||
OAuth2ScopeOpenID OAuth2Scope = "openid"
|
||||
OAuth2ScopeProfile OAuth2Scope = "profile"
|
||||
OAuth2ScopeEmail OAuth2Scope = "email"
|
||||
OAuth2ScopeOfflineAccess OAuth2Scope = "offline_access"
|
||||
)
|
||||
|
||||
var (
|
||||
_ fmt.Stringer = OAuth2Scope("")
|
||||
_ encoding.TextMarshaler = OAuth2Scope("")
|
||||
_ encoding.TextUnmarshaler = (*OAuth2Scope)(nil)
|
||||
)
|
||||
|
||||
func (v OAuth2Scope) IsValid() bool {
|
||||
switch v {
|
||||
case
|
||||
OAuth2ScopeOpenID,
|
||||
OAuth2ScopeProfile,
|
||||
OAuth2ScopeEmail,
|
||||
OAuth2ScopeOfflineAccess:
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (v OAuth2Scope) String() string {
|
||||
return string(v)
|
||||
}
|
||||
@@ -62,12 +42,7 @@ func (v OAuth2Scope) MarshalText() ([]byte, error) {
|
||||
}
|
||||
|
||||
func (v *OAuth2Scope) UnmarshalText(text []byte) error {
|
||||
val := OAuth2Scope(text)
|
||||
if !val.IsValid() {
|
||||
return fmt.Errorf("invalid OAuth2Scope value: %q", string(text))
|
||||
}
|
||||
|
||||
*v = val
|
||||
*v = OAuth2Scope(text)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package coredata_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"go.probo.inc/probo/pkg/coredata"
|
||||
)
|
||||
|
||||
func TestOAuth2Scope_IsValid(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
t.Run(
|
||||
"offline_access is valid",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
assert.True(t, coredata.OAuth2ScopeOfflineAccess.IsValid())
|
||||
},
|
||||
)
|
||||
|
||||
t.Run(
|
||||
"unknown scope is invalid",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
assert.False(t, coredata.OAuth2Scope("admin").IsValid())
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
func TestOAuth2Scope_UnmarshalText(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
t.Run(
|
||||
"offline_access unmarshals",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
var scope coredata.OAuth2Scope
|
||||
|
||||
err := scope.UnmarshalText([]byte("offline_access"))
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, coredata.OAuth2ScopeOfflineAccess, scope)
|
||||
},
|
||||
)
|
||||
|
||||
t.Run(
|
||||
"invalid scope returns error",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
var scope coredata.OAuth2Scope
|
||||
|
||||
err := scope.UnmarshalText([]byte("admin"))
|
||||
assert.Error(t, err)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
func TestOAuth2Scopes_Contains(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
t.Run(
|
||||
"contains offline_access",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
scopes := coredata.OAuth2Scopes{
|
||||
coredata.OAuth2ScopeOpenID,
|
||||
coredata.OAuth2ScopeOfflineAccess,
|
||||
}
|
||||
assert.True(t, scopes.Contains(coredata.OAuth2ScopeOfflineAccess))
|
||||
},
|
||||
)
|
||||
|
||||
t.Run(
|
||||
"does not contain offline_access",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
scopes := coredata.OAuth2Scopes{
|
||||
coredata.OAuth2ScopeOpenID,
|
||||
coredata.OAuth2ScopeProfile,
|
||||
}
|
||||
assert.False(t, scopes.Contains(coredata.OAuth2ScopeOfflineAccess))
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
func TestOAuth2Scopes_OrDefault(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
defaultScopes := coredata.OAuth2Scopes{
|
||||
coredata.OAuth2ScopeOpenID,
|
||||
coredata.OAuth2ScopeProfile,
|
||||
}
|
||||
|
||||
t.Run(
|
||||
"returns default when scopes is nil",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
var scopes coredata.OAuth2Scopes
|
||||
|
||||
result := scopes.OrDefault(defaultScopes)
|
||||
assert.Equal(t, defaultScopes, result)
|
||||
},
|
||||
)
|
||||
|
||||
t.Run(
|
||||
"returns default when scopes is empty",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
scopes := coredata.OAuth2Scopes{}
|
||||
result := scopes.OrDefault(defaultScopes)
|
||||
assert.Equal(t, defaultScopes, result)
|
||||
},
|
||||
)
|
||||
|
||||
t.Run(
|
||||
"returns scopes when non-empty",
|
||||
func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
scopes := coredata.OAuth2Scopes{coredata.OAuth2ScopeEmail}
|
||||
result := scopes.OrDefault(defaultScopes)
|
||||
assert.Equal(t, scopes, result)
|
||||
},
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user