Skip to content
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

Disable /login path for roles with role_type oidc #38

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Disable /login path for roles with role_type oidc #38

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
10 changes: 5 additions & 5 deletions path_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ func (b *jwtAuthBackend) pathLogin(ctx context.Context, req *logical.Request, d
return logical.ErrorResponse("role %q could not be found", roleName), nil
}

if role.RoleType == "oidc" {
return logical.ErrorResponse("role with oidc role_type is not allowed"), nil
}

token := d.Get("jwt").(string)
if len(token) == 0 {
return logical.ErrorResponse("missing token"), nil
Expand Down Expand Up @@ -228,13 +232,9 @@ func (b *jwtAuthBackend) verifyOIDCToken(ctx context.Context, config *jwtConfig,

oidcConfig := &oidc.Config{
SupportedSigningAlgs: config.JWTSupportedAlgs,
SkipClientIDCheck: true,
}

if role.RoleType == "oidc" {
oidcConfig.ClientID = config.OIDCClientID
} else {
oidcConfig.SkipClientIDCheck = true
}
verifier := provider.Verifier(oidcConfig)

idToken, err := verifier.Verify(ctx, rawToken)
Expand Down
63 changes: 57 additions & 6 deletions path_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"gopkg.in/square/go-jose.v2/jwt"
)

func setupBackend(t *testing.T, oidc, audience bool, boundClaims bool, boundCIDRs bool) (logical.Backend, logical.Storage) {
func setupBackend(t *testing.T, oidc, role_type_oidc, audience bool, boundClaims bool, boundCIDRs bool) (logical.Backend, logical.Storage) {
b, storage := getBackend(t)

var data map[string]interface{}
Expand Down Expand Up @@ -62,6 +62,10 @@ func setupBackend(t *testing.T, oidc, audience bool, boundClaims bool, boundCIDR
"/org/primary": "primary_org",
},
}
if role_type_oidc {
data["role_type"] = "oidc"
data["allowed_redirect_uris"] = "http://127.0.0.1"
}
if audience {
data["bound_audiences"] = []string{"https://vault.plugin.auth.jwt.test", "another_audience"}
}
Expand Down Expand Up @@ -147,9 +151,56 @@ func getTestOIDC(t *testing.T) string {
}

func TestLogin_JWT(t *testing.T) {
// Test role_type oidc
{
b, storage := setupBackend(t, false, true, true, false, false)
cl := jwt.Claims{
Subject: "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
Issuer: "https://team-vault.auth0.com/",
NotBefore: jwt.NewNumericDate(time.Now().Add(-5 * time.Second)),
Audience: jwt.Audience{"https://vault.plugin.auth.jwt.test"},
}

privateCl := struct {
User string `json:"https://vault/user"`
Groups []string `json:"https://vault/groups"`
}{
"jeff",
[]string{"foo", "bar"},
}

jwtData, _ := getTestJWT(t, ecdsaPrivKey, cl, privateCl)

data := map[string]interface{}{
"role": "plugin-test",
"jwt": jwtData,
}

req := &logical.Request{
Operation: logical.UpdateOperation,
Path: "login",
Storage: storage,
Data: data,
}

resp, err := b.HandleRequest(context.Background(), req)
if err != nil {
t.Fatal(err)
}
if resp == nil {
t.Fatal("got nil response")
}
if !resp.IsError() {
t.Fatal("expected error")
}
if !strings.Contains(resp.Error().Error(), "role with oidc role_type is not allowed") {
t.Fatalf("unexpected error: %v", resp.Error())
}
}

// Test missing audience
{
b, storage := setupBackend(t, false, false, false, false)
b, storage := setupBackend(t, false, false, false, false, false)
cl := jwt.Claims{
Subject: "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
Issuer: "https://team-vault.auth0.com/",
Expand Down Expand Up @@ -198,7 +249,7 @@ func TestLogin_JWT(t *testing.T) {
{
// run test with and without bound_cidrs configured
for _, useBoundCIDRs := range []bool{false, true} {
b, storage := setupBackend(t, false, true, true, useBoundCIDRs)
b, storage := setupBackend(t, false, false, true, true, useBoundCIDRs)

cl := jwt.Claims{
Subject: "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
Expand Down Expand Up @@ -287,7 +338,7 @@ func TestLogin_JWT(t *testing.T) {
}
}

b, storage := setupBackend(t, false, true, true, false)
b, storage := setupBackend(t, false, false, true, true, false)

// test invalid bound claim
{
Expand Down Expand Up @@ -678,7 +729,7 @@ func TestLogin_JWT(t *testing.T) {

// test invalid address
{
b, storage := setupBackend(t, false, false, false, true)
b, storage := setupBackend(t, false, false, false, false, true)

cl := jwt.Claims{
Subject: "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
Expand Down Expand Up @@ -754,7 +805,7 @@ func TestLogin_JWT(t *testing.T) {
}

func TestLogin_OIDC(t *testing.T) {
b, storage := setupBackend(t, true, true, false, false)
b, storage := setupBackend(t, true, false, true, false, false)

jwtData := getTestOIDC(t)

Expand Down