fix license base64 decode salt. (labring#4127)

Signed-off-by: yy <[email protected]>

controllers/job/init/deploy/manifests/deploy.yaml

@@ -39,7 +39,7 @@ spec:
  secretKeyRef:
  name: desktop-frontend-secret
  key: mongodb_uri
- - name: PASSWORD_SALT_KEY
+ - name: PASSWORD_SALT
  valueFrom:
  secretKeyRef:
  name: desktop-frontend-secret

controllers/job/init/internal/util/database/password.go

@@ -2,7 +2,6 @@ package database
 
 import (
  "crypto/sha256"
- "encoding/base64"
  "encoding/hex"
  "os"
 )
@@ -11,12 +10,8 @@ var (
  saltKey = os.Getenv("PASSWORD_SALT_KEY")
 )
 
-func hashPassword(password string) (string, error) {
+func hashPassword(password string) string {
  hash := sha256.New()
- validSalt, err := base64.StdEncoding.DecodeString(saltKey)
- if err != nil {
- return "", err
- }
- hash.Write([]byte(password + string(validSalt)))
- return hex.EncodeToString(hash.Sum(nil)), nil
+ hash.Write([]byte(password + saltKey))
+ return hex.EncodeToString(hash.Sum(nil))
 }

controllers/job/init/internal/util/database/user.go

@@ -56,11 +56,7 @@ func PresetAdminUser(ctx context.Context) error {
 }
 
 func newAdminUser() (*User, error) {
- hashedPassword, err := hashPassword(DefaultAdminPassword)
- if err != nil {
- return nil, err
- }
- return newUser(uuid.New().String(), DefaultAdminUserName, DefaultAdminUserName, hashedPassword, controller.DefaultAdminUserName), nil
+ return newUser(uuid.New().String(), DefaultAdminUserName, DefaultAdminUserName, hashPassword(DefaultAdminPassword), controller.DefaultAdminUserName), nil
 }
 
 func newUser(uid, name, passwordUser, hashedPassword, k8sUser string) *User {

deploy/cloud/scripts/init.sh

@@ -172,7 +172,7 @@ function sealos_authorize {
  # wait for admin user create
  echo "Waiting for admin user create"
 
- while [ -z "$(kubectl get ns -n ns-admin 2>/dev/null)" ]; do
+ while [ -z "$(kubectl get ns ns-admin 2>/dev/null)" ]; do
  sleep 1
  done