do not encrypt/decrypt password

supremind · Jan 5, 2021 · dfecf26 · dfecf26
1 parent d2dcb82
commit dfecf26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 104 deletions.
diff --git a/src/csi/backend/plugin/fusionstorage.go b/src/csi/backend/plugin/fusionstorage.go
@@ -7,7 +7,6 @@ import (
 	"github.com/Huawei/eSDK_K8S_Plugin/src/storage/fusionstorage/client"
 	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
 	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
-	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/pwd"
 )
 
 const (
@@ -35,13 +34,8 @@ func (p *FusionStoragePlugin) init(config map[string]interface{}, keepLogin bool
 		return errors.New("password must be provided")
 	}
 
-	decrypted, err := pwd.Decrypt(password)
-	if err != nil {
-		return err
-	}
-
-	cli := client.NewClient(url, user, decrypted)
-	err = cli.Login()
+	cli := client.NewClient(url, user, password)
+	err := cli.Login()
 	if err != nil {
 		return err
 	}

diff --git a/src/csi/backend/plugin/oceanstor.go b/src/csi/backend/plugin/oceanstor.go
@@ -8,7 +8,6 @@ import (
 	"github.com/Huawei/eSDK_K8S_Plugin/src/storage/oceanstor/client"
 	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
 	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
-	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/pwd"
 )
 
 const (
@@ -51,15 +50,10 @@ func (p *OceanstorPlugin) init(config map[string]interface{}, keepLogin bool) er
 		return errors.New("product only support config: V3, V5, Dorado")
 	}
 
-	decrypted, err := pwd.Decrypt(password)
-	if err != nil {
-		return err
-	}
-
 	vstoreName, _ := config["vstoreName"].(string)
 
-	cli := client.NewClient(urls, user, decrypted, vstoreName)
-	err = cli.Login()
+	cli := client.NewClient(urls, user, password, vstoreName)
+	err := cli.Login()
 	if err != nil {
 		return err
 	}

diff --git a/src/tools/passwdEncrypt/passwdEncrypt.go b/src/tools/passwdEncrypt/passwdEncrypt.go
diff --git a/src/utils/pwd/pwd.go b/src/utils/pwd/pwd.go