support oidc identity provider

Signed-off-by: hongming <talonwan@yunify.com>

pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas.go

@@ -37,7 +37,7 @@ type aliyunIDaaS struct {
 	ClientID string `json:"clientID" yaml:"clientID"`
 
 	// ClientSecret is the application's secret.
-	ClientSecret string `json:"-" yaml:"clientSecret"`
+	ClientSecret string `json:"clientSecret" yaml:"clientSecret"`
 
 	// Endpoint contains the resource server's token endpoint
 	// URLs. These are constants specific to each server and are
@@ -51,6 +51,8 @@ type aliyunIDaaS struct {
 
 	// Scope specifies optional requested permissions.
 	Scopes []string `json:"scopes" yaml:"scopes"`
+
+	Config *oauth2.Config `json:"-" yaml:"-"`
 }
 
 // endpoint represents an OAuth 2.0 provider's authorization and token
@@ -58,7 +60,7 @@ type aliyunIDaaS struct {
 type endpoint struct {
 	AuthURL     string `json:"authURL" yaml:"authURL"`
 	TokenURL    string `json:"tokenURL" yaml:"tokenURL"`
-	UserInfoURL string `json:"user_info_url" yaml:"userInfoUrl"`
+	UserInfoURL string `json:"userInfoURL" yaml:"userInfoURL"`
 }
 
 type idaasIdentity struct {
@@ -81,15 +83,26 @@ type userInfoResp struct {
 type idaasProviderFactory struct {
 }
 
-func (g *idaasProviderFactory) Type() string {
-	return "AliyunIDaasProvider"
+func (f *idaasProviderFactory) Type() string {
+	return "AliyunIDaaSProvider"
 }
 
-func (g *idaasProviderFactory) Create(options *oauth.DynamicOptions) (identityprovider.OAuthProvider, error) {
+func (f *idaasProviderFactory) Create(options oauth.DynamicOptions) (identityprovider.OAuthProvider, error) {
 	var idaas aliyunIDaaS
 	if err := mapstructure.Decode(options, &idaas); err != nil {
 		return nil, err
 	}
+	idaas.Config = &oauth2.Config{
+		ClientID:     idaas.ClientID,
+		ClientSecret: idaas.ClientSecret,
+		Endpoint: oauth2.Endpoint{
+			AuthURL:   idaas.Endpoint.AuthURL,
+			TokenURL:  idaas.Endpoint.TokenURL,
+			AuthStyle: oauth2.AuthStyleAutoDetect,
+		},
+		RedirectURL: idaas.RedirectURL,
+		Scopes:      idaas.Scopes,
+	}
 	return &idaas, nil
 }
 
@@ -105,28 +118,13 @@ func (a idaasIdentity) GetEmail() string {
 	return a.Email
 }
 
-func (a idaasIdentity) GetDisplayName() string {
-	return a.Nickname
-}
-
 func (a *aliyunIDaaS) IdentityExchange(code string) (identityprovider.Identity, error) {
-	config := oauth2.Config{
-		ClientID:     a.ClientID,
-		ClientSecret: a.ClientSecret,
-		Endpoint: oauth2.Endpoint{
-			AuthURL:   a.Endpoint.AuthURL,
-			TokenURL:  a.Endpoint.TokenURL,
-			AuthStyle: oauth2.AuthStyleAutoDetect,
-		},
-		RedirectURL: a.RedirectURL,
-		Scopes:      a.Scopes,
-	}
-	token, err := config.Exchange(context.Background(), code)
+	token, err := a.Config.Exchange(context.TODO(), code)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := oauth2.NewClient(context.Background(), oauth2.StaticTokenSource(token)).Get(a.Endpoint.UserInfoURL)
+	resp, err := oauth2.NewClient(context.TODO(), oauth2.StaticTokenSource(token)).Get(a.Endpoint.UserInfoURL)
 	if err != nil {
 		return nil, err
 	}

pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go

@@ -0,0 +1,96 @@
+/*
+Copyright 2020 The KubeSphere 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 aliyunidaas
+
+import (
+	"golang.org/x/oauth2"
+	"gopkg.in/yaml.v3"
+	"kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider"
+	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"
+	"reflect"
+	"testing"
+)
+
+func Test_idaasProviderFactory_Create(t *testing.T) {
+	type args struct {
+		options oauth.DynamicOptions
+	}
+
+	mustUnmarshalYAML := func(data string) oauth.DynamicOptions {
+		var dynamicOptions oauth.DynamicOptions
+		_ = yaml.Unmarshal([]byte(data), &dynamicOptions)
+		return dynamicOptions
+	}
+
+	tests := []struct {
+		name    string
+		args    args
+		want    identityprovider.OAuthProvider
+		wantErr bool
+	}{
+		{
+			name: "should create successfully",
+			args: args{options: mustUnmarshalYAML(`
+clientID: xxxx
+clientSecret: xxxx
+endpoint:
+  userInfoUrl: "https://xxxxx.login.aliyunidaas.com/api/bff/v1.2/oauth2/userinfo"
+  authURL: "https://xxxx.login.aliyunidaas.com/oauth/authorize"
+  tokenURL: "https://xxxx.login.aliyunidaas.com/oauth/token"
+redirectURL: "http://ks-console/oauth/redirect"
+scopes:
+- read
+`)},
+			want: &aliyunIDaaS{
+				ClientID:     "xxxx",
+				ClientSecret: "xxxx",
+				Endpoint: endpoint{
+					AuthURL:     "https://xxxx.login.aliyunidaas.com/oauth/authorize",
+					TokenURL:    "https://xxxx.login.aliyunidaas.com/oauth/token",
+					UserInfoURL: "https://xxxxx.login.aliyunidaas.com/api/bff/v1.2/oauth2/userinfo",
+				},
+				RedirectURL: "http://ks-console/oauth/redirect",
+				Scopes:      []string{"read"},
+				Config: &oauth2.Config{
+					ClientID:     "xxxx",
+					ClientSecret: "xxxx",
+					Endpoint: oauth2.Endpoint{
+						AuthURL:   "https://xxxx.login.aliyunidaas.com/oauth/authorize",
+						TokenURL:  "https://xxxx.login.aliyunidaas.com/oauth/token",
+						AuthStyle: oauth2.AuthStyleAutoDetect,
+					},
+					RedirectURL: "http://ks-console/oauth/redirect",
+					Scopes:      []string{"read"},
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			f := &idaasProviderFactory{}
+			got, err := f.Create(tt.args.options)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Create() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Create() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}