Similarityoung commented on code in PR #1087:
URL: https://github.com/apache/dubbo-go-pixiu/pull/1087#discussion_r4561359193
##########
admin/initialize/router.go:
##########
@@ -42,14 +42,14 @@ func Routers() *gin.Engine {
// Guest router
router.POST("/login", account.Login)
- router.POST("/register", account.Register)
// auth router
taR := router.Group("/", auth.JWTAuth())
// The following router needs to check the token
{
// user router
+ taR.POST("/register", account.Register)
Review Comment:
本次只给 `/register` 增加了管理员校验;同组的 `/config/api/*`、OPA 等敏感路由仍只经过 `JWTAuth`。升级前的
`/register` 是公开的,旧表 `role` 默认值为 1,旧 `Register` 还会写入
`pixiu_user_role(role_id=1)`,因此升级前通过公开接口注册的账号现在仍是管理员,可继续修改网关配置并通过新的 `/register`
创建更多管理员。另外,`EnsureDefaultAdmin` 对已存在的 `admin` 使用 `INSERT IGNORE`
并保留原密码/角色;如果攻击者预注册了 `admin`,默认密码不会生效,攻击者账号仍存活。
建议:增加一次性升级审计/迁移,禁用或降级旧的非 bootstrap 管理员;给敏感配置路由增加管理员中间件,或明确所有认证用户都是管理员并移除
role=0 的 UI/模型。对既有 `admin` 账号至少在启动时输出明确告警。
##########
admin/dao/impl/guest.go:
##########
@@ -57,33 +60,136 @@ func (d *GuestDao) Login(username, password string) (bool,
int) {
return true, id
}
-func (d *GuestDao) Register(username, password string) error {
+func (d *GuestDao) EnsureUsernameUniqueIndex() error {
+ indexed, err := hasUniqueUsernameIndex(d.db)
+ if err != nil {
+ return err
+ }
+ if indexed {
+ return nil
+ }
- if username == "" {
- return errors.New("void username")
+ if username, err := findDuplicateUsername(d.db); err == nil {
+ return fmt.Errorf("cannot add unique username index: duplicate
username %q exists; resolve duplicate accounts and restart", username)
+ } else if !errors.Is(err, SQL.ErrNoRows) {
+ return err
}
- db := d.db
- var id int
- err := db.QueryRow("SELECT id FROM pixiu_user WHERE username = ?",
username).Scan(&id)
+ _, err = d.db.Exec("ALTER TABLE pixiu_user ADD UNIQUE INDEX
uniq_pixiu_user_username (username)")
+ if err == nil {
+ return nil
+ }
+
+ // Another Pixiu instance may have added the index while this instance
was starting.
+ if indexed, checkErr := hasUniqueUsernameIndex(d.db); checkErr == nil
&& indexed {
+ return nil
+ }
+ if username, duplicateErr := findDuplicateUsername(d.db); duplicateErr
== nil {
+ return fmt.Errorf("cannot add unique username index: duplicate
username %q exists; resolve duplicate accounts and restart", username)
+ }
+ return fmt.Errorf("failed to add unique username index: %w", err)
+}
+
+func hasUniqueUsernameIndex(db *SQL.DB) (bool, error) {
Review Comment:
`hasUniqueUsernameIndex` 没有检查 `SUB_PART`。如果已有 `UNIQUE(username(191))`(旧
MySQL/utf8mb4 规避索引长度的常见做法),会被误判为已完成迁移;之后不同但前 191 字符相同的合法用户名会被唯一索引拒绝,而
`Register` 的重复预检查找不到冲突,最终返回 `user already exists`。另外,`ALTER TABLE ... ADD
UNIQUE INDEX uniq_pixiu_user_username` 使用固定索引名;若同名非唯一索引已存在,启动会因 1061 失败。
建议:检测时要求 `SUB_PART IS NULL`(完整列唯一索引);对同名索引冲突做显式迁移或给出明确错误。
##########
admin/controller/account/user.go:
##########
@@ -82,25 +83,20 @@ func EditPassword(c *gin.Context) {
oldPassword := c.PostForm("oldPassword")
newPassword := c.PostForm("newPassword")
-
- //if flag, _ :=
regexp.MatchString("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
oldPassword); !flag {
- // c.JSON(http.StatusOK, gin.H{
- // "status": -1,
- // "msg": "illegal oldPassword",
- // "data": nil,
- // })
- // return
- //}
- //
- //if flag, _ :=
regexp.MatchString("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
newPassword); !flag {
- // c.JSON(http.StatusOK, gin.H{
- // "status": -1,
- // "msg": "illegal newPassword",
- // "data": nil,
- // })
- // return
- //}
- username := c.Request.Header.Get("username")
+ newPasswordLength := utf8.RuneCountInString(newPassword)
+ if oldPassword == "" || newPassword == "" {
+ c.JSON(http.StatusOK, config.WithError(errors.New("old and new
passwords are required")))
+ return
+ }
+ if newPasswordLength < 8 || newPasswordLength > 128 {
+ c.JSON(http.StatusOK, config.WithError(errors.New("new password
must be between 8 and 128 characters")))
+ return
+ }
+ if oldPassword == newPassword {
+ c.JSON(http.StatusOK, config.WithError(errors.New("new password
must differ from the old password")))
+ return
+ }
+ username := auth.CurrentUsername(c)
flag, err := account.EditPassword(oldPassword, newPassword, username)
Review Comment:
这个 DAO 仍是先 `SELECT id,password` 再按 `id/username` 更新,且 `RowsAffected` 只检查
error、不检查是否为 0。两个并发改密请求都能通过旧密码校验,最后写入者覆盖前者;如果行在两步之间被删除,接口仍返回成功。本次个人中心直接暴露了该路径。
建议:改成单条原子更新 `UPDATE pixiu_user SET password=?, date_updated=? WHERE
username=? AND password=?`,并检查 `RowsAffected() == 1`。
##########
admin/dao/impl/guest.go:
##########
@@ -57,33 +60,136 @@ func (d *GuestDao) Login(username, password string) (bool,
int) {
return true, id
}
-func (d *GuestDao) Register(username, password string) error {
+func (d *GuestDao) EnsureUsernameUniqueIndex() error {
+ indexed, err := hasUniqueUsernameIndex(d.db)
+ if err != nil {
+ return err
+ }
+ if indexed {
+ return nil
+ }
- if username == "" {
- return errors.New("void username")
+ if username, err := findDuplicateUsername(d.db); err == nil {
+ return fmt.Errorf("cannot add unique username index: duplicate
username %q exists; resolve duplicate accounts and restart", username)
+ } else if !errors.Is(err, SQL.ErrNoRows) {
+ return err
}
- db := d.db
- var id int
- err := db.QueryRow("SELECT id FROM pixiu_user WHERE username = ?",
username).Scan(&id)
+ _, err = d.db.Exec("ALTER TABLE pixiu_user ADD UNIQUE INDEX
uniq_pixiu_user_username (username)")
+ if err == nil {
+ return nil
+ }
+
+ // Another Pixiu instance may have added the index while this instance
was starting.
+ if indexed, checkErr := hasUniqueUsernameIndex(d.db); checkErr == nil
&& indexed {
+ return nil
+ }
+ if username, duplicateErr := findDuplicateUsername(d.db); duplicateErr
== nil {
+ return fmt.Errorf("cannot add unique username index: duplicate
username %q exists; resolve duplicate accounts and restart", username)
+ }
+ return fmt.Errorf("failed to add unique username index: %w", err)
+}
+
+func hasUniqueUsernameIndex(db *SQL.DB) (bool, error) {
+ var indexed bool
+ err := db.QueryRow(`
+ SELECT EXISTS (
+ SELECT index_name
+ FROM information_schema.statistics
+ WHERE table_schema = DATABASE()
+ AND table_name = 'pixiu_user'
+ AND non_unique = 0
+ GROUP BY index_name
+ HAVING COUNT(*) = 1 AND MAX(column_name = 'username') =
1
+ )
+ `).Scan(&indexed)
+ return indexed, err
+}
+
+func findDuplicateUsername(db *SQL.DB) (string, error) {
+ var username string
+ err := db.QueryRow(`
+ SELECT username
+ FROM pixiu_user
+ GROUP BY username
+ HAVING COUNT(*) > 1
+ LIMIT 1
+ `).Scan(&username)
+ return username, err
+}
+
+func (d *GuestDao) EnsureDefaultAdmin(username, password string) error {
+ tx, err := d.db.Begin()
+ if err != nil {
+ return err
+ }
+ defer tx.Rollback()
+
+ if _, err := tx.Exec(`
+ INSERT IGNORE INTO pixiu_role (id, role_name, description)
+ VALUES (1, 'admin', 'Administrator')
+ `); err != nil {
+ return err
+ }
+ if _, err := tx.Exec(`
+ INSERT IGNORE INTO pixiu_user (username, password, role)
+ VALUES (?, ?, 1)
+ `, username, password); err != nil {
+ return err
+ }
+
+ var userID int64
+ var role int
+ if err := tx.QueryRow("SELECT id, role FROM pixiu_user WHERE username =
? FOR UPDATE", username).Scan(&userID, &role); err != nil {
+ return err
+ }
+ if role == 1 {
Review Comment:
`EnsureDefaultAdmin` 对已存在的 `admin` 只做 `INSERT IGNORE`,随后仅当 `role == 1`
才补角色关联。如果已有 `admin` 是 `role !=
1`(`TestEnsureDefaultAdminPreservesExistingNonAdminAccount`
明确覆盖),启动会成功,但系统可能没有任何管理员;而 `/register` 现在又要求管理员,导致只能手工改库恢复。
建议:保留原账号密码/角色的同时,检查是否至少存在一个 `role=1` 账号;若不存在,明确失败或输出可操作的 bootstrap 告警。
##########
admin/dao/impl/guest_mysql_test.go:
##########
@@ -0,0 +1,308 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 impl
+
+import (
+ "database/sql"
+ "fmt"
+ "os"
+ "strings"
+ "sync"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/go-sql-driver/mysql"
+)
+
+func TestRegisterConcurrentUsernameIsUnique(t *testing.T) {
+ db := newGuestMySQLTestDB(t)
+ createGuestTestTables(t, db)
+
+ dao := &GuestDao{db: db}
+ if err := dao.EnsureUsernameUniqueIndex(); err != nil {
+ t.Fatalf("EnsureUsernameUniqueIndex() error = %v", err)
+ }
+
+ const attempts = 8
+ start := make(chan struct{})
+ results := make(chan error, attempts)
+ var workers sync.WaitGroup
+ workers.Add(attempts)
+ for i := 0; i < attempts; i++ {
+ go func() {
+ defer workers.Done()
+ <-start
+ results <- dao.Register("same-user", "hashed-password")
+ }()
+ }
+ close(start)
+ workers.Wait()
+ close(results)
+
+ successes, duplicates := 0, 0
+ for err := range results {
+ switch {
+ case err == nil:
+ successes++
+ case err.Error() == "user already exists":
+ duplicates++
+ default:
+ t.Errorf("Register() error = %v", err)
+ }
+ }
+ if successes != 1 || duplicates != attempts-1 {
+ t.Fatalf("registration results: successes = %d, duplicates =
%d; want 1 and %d", successes, duplicates, attempts-1)
+ }
+
+ var userCount, roleCount int
+ if err := db.QueryRow("SELECT COUNT(*) FROM pixiu_user WHERE username =
?", "same-user").Scan(&userCount); err != nil {
+ t.Fatal(err)
+ }
+ if err := db.QueryRow("SELECT COUNT(*) FROM
pixiu_user_role").Scan(&roleCount); err != nil {
+ t.Fatal(err)
+ }
+ if userCount != 1 || roleCount != 1 {
+ t.Fatalf("persisted rows: users = %d, roles = %d; want 1 each",
userCount, roleCount)
+ }
+}
+
+func TestEnsureUsernameUniqueIndexLeavesExistingDuplicatesUntouched(t
*testing.T) {
+ db := newGuestMySQLTestDB(t)
+ createGuestTestTables(t, db)
+ if _, err := db.Exec("INSERT INTO pixiu_user (username, password)
VALUES (?, ?), (?, ?)", "duplicate", "one", "duplicate", "two"); err != nil {
+ t.Fatal(err)
+ }
+
+ err := (&GuestDao{db: db}).EnsureUsernameUniqueIndex()
+ if err == nil || !strings.Contains(err.Error(), `duplicate username
"duplicate" exists`) {
+ t.Fatalf("EnsureUsernameUniqueIndex() error = %v, want
duplicate username error", err)
+ }
+
+ var count int
+ if err := db.QueryRow("SELECT COUNT(*) FROM pixiu_user WHERE username =
?", "duplicate").Scan(&count); err != nil {
+ t.Fatal(err)
+ }
+ if count != 2 {
+ t.Fatalf("duplicate rows after failed migration = %d, want 2
untouched rows", count)
+ }
+}
+
+func TestEnsureDefaultAdminSeedsRoleAndAssociation(t *testing.T) {
+ db := newGuestMySQLTestDB(t)
+ createGuestTestTables(t, db)
+ dao := &GuestDao{db: db}
+ if err := dao.EnsureUsernameUniqueIndex(); err != nil {
+ t.Fatalf("EnsureUsernameUniqueIndex() error = %v", err)
+ }
+
+ if err := dao.EnsureDefaultAdmin("admin", "initial-hash"); err != nil {
+ t.Fatalf("EnsureDefaultAdmin() error = %v", err)
+ }
+ if err := dao.EnsureDefaultAdmin("admin", "replacement-hash"); err !=
nil {
+ t.Fatalf("EnsureDefaultAdmin() second call error = %v", err)
+ }
+
+ var userID int64
+ var password string
+ var role int
+ if err := db.QueryRow("SELECT id, password, role FROM pixiu_user WHERE
username = ?", "admin").Scan(&userID, &password, &role); err != nil {
+ t.Fatal(err)
+ }
+ if password != "initial-hash" || role != 1 {
+ t.Fatalf("default admin = (password %q, role %d), want
(initial-hash, 1)", password, role)
+ }
+
+ var roleName, description string
+ if err := db.QueryRow("SELECT role_name, description FROM pixiu_role
WHERE id = 1").Scan(&roleName, &description); err != nil {
+ t.Fatal(err)
+ }
+ if roleName != "admin" || description != "Administrator" {
+ t.Fatalf("admin role = (%q, %q), want (admin, Administrator)",
roleName, description)
+ }
+
+ var associationCount int
+ if err := db.QueryRow("SELECT COUNT(*) FROM pixiu_user_role WHERE
user_id = ? AND role_id = 1", userID).Scan(&associationCount); err != nil {
+ t.Fatal(err)
+ }
+ if associationCount != 1 {
+ t.Fatalf("admin role associations = %d, want 1",
associationCount)
+ }
+
+ found, result, err := (&UserDao{db: db}).GetUserRole("admin")
+ if err != nil {
+ t.Fatalf("GetUserRole() error = %v", err)
+ }
+ if !found {
+ t.Fatal("GetUserRole() found = false, want true")
+ }
+ adminRole, ok := result.(map[string]any)
+ if !ok {
+ t.Fatalf("GetUserRole() result has type %T, want
map[string]any", result)
+ }
+ if adminRole["role"] != "admin" || adminRole["description"] !=
"Administrator" {
+ t.Fatalf("GetUserRole() = %#v, want admin role", adminRole)
+ }
+}
+
+func TestEnsureDefaultAdminPreservesExistingNonAdminAccount(t *testing.T) {
+ db := newGuestMySQLTestDB(t)
+ createGuestTestTables(t, db)
+ dao := &GuestDao{db: db}
+ if err := dao.EnsureUsernameUniqueIndex(); err != nil {
+ t.Fatalf("EnsureUsernameUniqueIndex() error = %v", err)
+ }
+ if _, err := db.Exec("INSERT INTO pixiu_user (username, password, role)
VALUES (?, ?, 0)", "admin", "existing-hash"); err != nil {
+ t.Fatal(err)
+ }
+
+ if err := dao.EnsureDefaultAdmin("admin", "default-hash"); err != nil {
+ t.Fatalf("EnsureDefaultAdmin() error = %v", err)
+ }
+
+ var password string
+ var role int
+ if err := db.QueryRow("SELECT password, role FROM pixiu_user WHERE
username = ?", "admin").Scan(&password, &role); err != nil {
+ t.Fatal(err)
+ }
+ if password != "existing-hash" || role != 0 {
+ t.Fatalf("existing account = (password %q, role %d), want
(existing-hash, 0)", password, role)
+ }
+
+ var associationCount int
+ if err := db.QueryRow("SELECT COUNT(*) FROM
pixiu_user_role").Scan(&associationCount); err != nil {
+ t.Fatal(err)
+ }
+ if associationCount != 0 {
+ t.Fatalf("non-admin account role associations = %d, want 0",
associationCount)
+ }
+}
+
+func TestGetUserRoleUsesRequestedUsername(t *testing.T) {
+ db := newGuestMySQLTestDB(t)
+ createGuestTestTables(t, db)
+ if _, err := db.Exec(`
+ INSERT INTO pixiu_role (id, role_name, description)
+ VALUES (1, 'admin', 'Administrator'), (2, 'reader', 'Read only')
+ `); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := db.Exec(`
+ INSERT INTO pixiu_user (id, username, password, role)
+ VALUES (1, 'admin', 'admin-hash', 1), (2, 'reader',
'reader-hash', 0)
+ `); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := db.Exec("INSERT INTO pixiu_user_role (user_id, role_id)
VALUES (1, 1), (2, 2)"); err != nil {
+ t.Fatal(err)
+ }
+
+ found, result, err := (&UserDao{db: db}).GetUserRole("reader")
+ if err != nil {
+ t.Fatalf("GetUserRole() error = %v", err)
+ }
+ if !found {
+ t.Fatal("GetUserRole() found = false, want true")
+ }
+ role, ok := result.(map[string]any)
+ if !ok {
+ t.Fatalf("GetUserRole() result has type %T, want
map[string]any", result)
+ }
+ if role["role"] != "reader" || role["description"] != "Read only" {
+ t.Fatalf("GetUserRole() = %#v, want reader role", role)
+ }
+}
+
+func newGuestMySQLTestDB(t *testing.T) *sql.DB {
+ t.Helper()
+ dsn := os.Getenv("PIXIU_TEST_MYSQL_DSN")
Review Comment:
这些覆盖唯一索引迁移、默认管理员幂等、角色关联和并发注册的测试,在未设置 `PIXIU_TEST_MYSQL_DSN` 时全部 `t.Skip`;当前
CI workflow 没有设置该变量,因此 `go test ./admin/...` 显示通过,但最关键的 MySQL 路径实际未执行。
建议:在 CI 中增加 MySQL service(或 testcontainers)并设置 DSN,至少为迁移和并发测试建立独立 job。
##########
admin/controller/account/user.go:
##########
@@ -82,25 +83,20 @@ func EditPassword(c *gin.Context) {
oldPassword := c.PostForm("oldPassword")
newPassword := c.PostForm("newPassword")
-
- //if flag, _ :=
regexp.MatchString("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
oldPassword); !flag {
- // c.JSON(http.StatusOK, gin.H{
- // "status": -1,
- // "msg": "illegal oldPassword",
- // "data": nil,
- // })
- // return
- //}
- //
- //if flag, _ :=
regexp.MatchString("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
newPassword); !flag {
- // c.JSON(http.StatusOK, gin.H{
- // "status": -1,
- // "msg": "illegal newPassword",
- // "data": nil,
- // })
- // return
- //}
- username := c.Request.Header.Get("username")
+ newPasswordLength := utf8.RuneCountInString(newPassword)
+ if oldPassword == "" || newPassword == "" {
+ c.JSON(http.StatusOK, config.WithError(errors.New("old and new
passwords are required")))
+ return
+ }
+ if newPasswordLength < 8 || newPasswordLength > 128 {
+ c.JSON(http.StatusOK, config.WithError(errors.New("new password
must be between 8 and 128 characters")))
+ return
+ }
+ if oldPassword == newPassword {
+ c.JSON(http.StatusOK, config.WithError(errors.New("new password
must differ from the old password")))
+ return
+ }
+ username := auth.CurrentUsername(c)
Review Comment:
本次安全边界是“身份只取 JWT,忽略请求头 `username`”,但新增测试只覆盖了
`Register`;`getInfo`、`password/edit`、`getUserRole`、`checkIsAdmin` 没有后端回归测试验证伪造
`username` 头不会改变身份。前端不发送该头并不能阻止恶意客户端发送。
建议:为这四个 handler 增加测试,JWT claims 为 A、请求头 `username=B`,断言 DAO 收到 A(可用 fake DAO
或类似 `registerAccount` 的注入方式)。
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]