Skip to content

Commit

Permalink
auth: add type checking of tokenProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
hexfusion committed May 16, 2018
1 parent 4a4be92 commit 042033f
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 1 deletion.
2 changes: 1 addition & 1 deletion auth/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,7 @@ func NewTokenProvider(
}

func (as *authStore) WithRoot(ctx context.Context) context.Context {
if !as.IsAuthEnabled() {
if tt := tokenProviderType(as); tt != "simple" || !as.IsAuthEnabled() {
return ctx
}

Expand Down
26 changes: 26 additions & 0 deletions auth/util.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2018 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package auth

func tokenProviderType(as *authStore) string {
switch as.tokenProvider.(type) {
case *tokenSimple:
return "simple"
case *tokenJWT:
return "jwt"
default:
return ""
}
}
42 changes: 42 additions & 0 deletions auth/util_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright 2018 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package auth

import (
"testing"

"go.uber.org/zap"
)

func TestTokenProviderType(t *testing.T) {
for _, test := range []struct {
have, want string
}{
{"simple", "simple"},
{"jwt", "jwt"},
{"invalid", ""},
{"", ""},
} {
tp, _ := NewTokenProvider(zap.NewExample(), test.have, dummyIndexWaiter)
as := &authStore{
tokenProvider: tp,
}
tt := tokenProviderType(as)

if tt != test.want {
t.Fatalf("tokenProviderType: expected %s, got %s", test.want, tt)
}
}
}

0 comments on commit 042033f

Please sign in to comment.