[servicecomb-service-center] branch master updated: use plain content when private key decrypted failed (#663)

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c935dd  use plain content when private key decrypted failed (#663)
6c935dd is described below

commit 6c935ddb3da7eb132f2e32788c99b84fced038e6
Author: humingcheng <hu...@163.com>
AuthorDate: Mon Jul 13 19:49:34 2020 +0800

    use plain content when private key decrypted failed (#663)
---
 server/service/rbac/rbac.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/service/rbac/rbac.go b/server/service/rbac/rbac.go
index eb32c6e..cb3787c 100644
--- a/server/service/rbac/rbac.go
+++ b/server/service/rbac/rbac.go
@@ -137,21 +137,18 @@ func PublicKey() string {
 }
 
 //privateKey get decrypted private key to verify a token
-func privateKey() (string, error) {
+func privateKey() string {
 	ep := archaius.GetString("rbac_private_key", "")
 	p, err := cipher.Decrypt(ep)
 	if err != nil {
-		return "", err
+		return ep
 	}
-	return p, nil
+	return p
 }
 
 //GetPrivateKey return rsa key instance
 func GetPrivateKey() (*rsa.PrivateKey, error) {
-	sk, err := privateKey()
-	if err != nil {
-		return nil, err
-	}
+	sk := privateKey()
 	p, err := secret.ParseRSAPrivateKey(sk)
 	if err != nil {
 		log.Error("can not get key:", err)