Add PasswordSalt to org.

object/check.go

@@ -65,7 +65,7 @@ func checkPassword(user *User, password string) string {
 			return "password incorrect"
 		}
 	} else if organization.PasswordType == "salt" {
-		if getSaltedPassword(password) == user.Password {
+		if getSaltedPassword(password, organization.PasswordSalt) == user.Password {
 			return ""
 		} else {
 			return "password incorrect"

object/conf.go

@@ -1,17 +0,0 @@
-// Copyright 2021 The casbin Authors. All Rights Reserved.
-//
-// 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 object
-
-var salt = "123"

object/organization.go

@@ -28,6 +28,7 @@ type Organization struct {
 	WebsiteUrl   string `xorm:"varchar(100)" json:"websiteUrl"`
 	Favicon      string `xorm:"varchar(100)" json:"favicon"`
 	PasswordType string `xorm:"varchar(100)" json:"passwordType"`
+	PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
 }
 
 func GetOrganizations(owner string) []*Organization {

object/password.go

@@ -30,7 +30,7 @@ func getSha256HexDigest(s string) string {
 	return res
 }
 
-func getSaltedPassword(password string) string {
+func getSaltedPassword(password string, salt string) string {
 	hash1 := getSha256HexDigest(password)
 	res := getSha256HexDigest(hash1 + salt)
 	return res

object/user_test.go

@@ -47,5 +47,6 @@ func TestSyncIds(t *testing.T) {
 
 func TestGetSaltedPassword(t *testing.T) {
 	password := "123456"
-	fmt.Printf("%s -> %s\n", password, getSaltedPassword(password))
+	salt := "123"
+	fmt.Printf("%s -> %s\n", password, getSaltedPassword(password, salt))
 }

web/src/OrganizationEditPage.js

@@ -139,6 +139,16 @@ class OrganizationEditPage extends React.Component {
             </Select>
           </Col>
         </Row>
+        <Row style={{marginTop: '20px'}} >
+          <Col style={{marginTop: '5px'}} span={2}>
+            {i18next.t("general:Password salt")}:
+          </Col>
+          <Col span={22} >
+            <Input value={this.state.organization.passwordSalt} onChange={e => {
+              this.updateOrganizationField('passwordSalt', e.target.value);
+            }} />
+          </Col>
+        </Row>
       </Card>
     )
   }

web/src/OrganizationListPage.js

@@ -50,6 +50,8 @@ class OrganizationListPage extends React.Component {
       displayName: `New Organization - ${this.state.organizations.length}`,
       websiteUrl: "https://door.casbin.com",
       favicon: "https://cdn.casbin.com/static/favicon.ico",
+      passwordType: "plain",
+      PasswordSalt: "",
     }
   }
 
@@ -149,6 +151,13 @@ class OrganizationListPage extends React.Component {
         width: '150px',
         sorter: (a, b) => a.passwordType.localeCompare(b.passwordType),
       },
+      {
+        title: i18next.t("general:Password salt"),
+        dataIndex: 'passwordSalt',
+        key: 'passwordSalt',
+        width: '150px',
+        sorter: (a, b) => a.passwordSalt.localeCompare(b.passwordSalt),
+      },
       {
         title: i18next.t("general:Action"),
         dataIndex: '',

web/src/UserListPage.js

@@ -49,7 +49,6 @@ class UserListPage extends React.Component {
       createdTime: moment().format(),
       type: "normal-user",
       password: "123",
-      passwordType: "plain",
       displayName: `New User - ${this.state.users.length}`,
       avatar: "https://casbin.org/img/casbin.svg",
       email: "user@example.com",
@@ -58,6 +57,8 @@ class UserListPage extends React.Component {
       affiliation: "Example Inc.",
       tag: "staff",
       isAdmin: false,
+      isGlobalAdmin: false,
+      IsForbidden: false,
     }
   }
 

web/src/locales/en.json

@@ -20,6 +20,7 @@
     "Preview": "Preview",
     "User type": "User type",
     "Password type": "Password type",
+    "Password salt": "Password salt",
     "Password": "Password",
     "Email": "Email",
     "Phone": "Phone",

web/src/locales/zh.json

@@ -20,6 +20,7 @@
     "Preview": "预览",
     "User type": "用户类型",
     "Password type": "密码类型",
+    "Password salt": "密码Salt值",
     "Password": "密码",
     "Email": "电子邮箱",
     "Phone": "手机号",