From f5ba6cb255b59a057d072a3d7beaf1bf28ffdac9 Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Thu, 17 Sep 2026 20:19:03 +0800 Subject: [PATCH] fix: remove minimum length requirement for bootstrap admin password --- docs/11-server-test-deployment.md | 1 + infra/moyi/deploy.py | 4 +++- infra/moyi/tests/test_deploy.py | 31 ++++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/11-server-test-deployment.md b/docs/11-server-test-deployment.md index 3211930..e9d94d0 100644 --- a/docs/11-server-test-deployment.md +++ b/docs/11-server-test-deployment.md @@ -170,6 +170,7 @@ sudo nano .env.cloud - 用户通过邀请码注册,角色固定为普通用户;注册成功即登录。超级管理员进入“管理端 → 用户与额度”,点击用户行,再通过“调整角色”授予或撤销平台管理员身份。不能在此处降级自己或创建第二个超级管理员。角色变化写入审计,降级后原会话的管理接口权限立即失效。 - 查找当前初始账号与密码:在服务器运行 `sudo nano /opt/moyi/releases/20260911-151010-8cd7e410/infra/moyi/.env.cloud`,仅查看 `ADMIN_ACCOUNT`、`ADMIN_PASSWORD` 后退出,不要把文件或密码发送到聊天。升级后使用实际版本目录。 - `ADMIN_PASSWORD` 只在首次建号时使用,后续修改它不会重置数据库里的密码。本版本未提供自助密码找回;不要重新运行 `init`、删除用户或更换 Pepper 来恢复登录。 +- 超级管理员密码不强制最小位数或字符组合,但不能为空、全为空白或保留模板占位值。普通用户注册仍要求至少 8 位;密码 Pepper 和供应商凭证加密密钥仍要求至少 32 个字符,这些不是登录密码。 ## 4. 环境变量怎么填 diff --git a/infra/moyi/deploy.py b/infra/moyi/deploy.py index 1c6a4f3..5dde775 100644 --- a/infra/moyi/deploy.py +++ b/infra/moyi/deploy.py @@ -86,7 +86,9 @@ def validate_config(config, mode): value = str(api.get(key, "")) if not value or any(marker in value.upper() for marker in ("CHANGE_ME", "GENERATE_", "REPLACE-WITH")): fail("Missing/placeholder setting: " + key) - for key, minimum in (("AUTH_PASSWORD_PEPPER", 32), ("CREDENTIAL_ENCRYPTION_KEY", 32), ("ADMIN_PASSWORD", 16)): + if not str(api["ADMIN_PASSWORD"]).strip(): + fail("ADMIN_PASSWORD must not be blank.") + for key, minimum in (("AUTH_PASSWORD_PEPPER", 32), ("CREDENTIAL_ENCRYPTION_KEY", 32)): if len(str(api[key])) < minimum: fail(key + " is too short (minimum " + str(minimum) + " characters).") if api["AUTH_PASSWORD_PEPPER"] == api["CREDENTIAL_ENCRYPTION_KEY"]: diff --git a/infra/moyi/tests/test_deploy.py b/infra/moyi/tests/test_deploy.py index 4908656..cfa3aec 100644 --- a/infra/moyi/tests/test_deploy.py +++ b/infra/moyi/tests/test_deploy.py @@ -74,6 +74,34 @@ class DeploymentTests(unittest.TestCase): def test_tunnel_config(self): deploy.validate_config(configuration(), "tunnel") + def test_admin_password_has_no_minimum_length(self): + for mode in ("tunnel", "https"): + for password in ("x", "Test7!", "Qa-Test42!"): + with self.subTest(mode=mode, length=len(password)): + cfg = configuration() + api = cfg["services"]["moyi-api"]["environment"] + api["ADMIN_PASSWORD"] = password + api["AUTH_SECURE_COOKIE"] = "true" if mode == "https" else "false" + deploy.validate_config(cfg, mode) + + def test_admin_password_still_rejects_empty_blank_and_placeholder(self): + for password in ("", " ", "\t\r\n", "GENERATE_ADMIN_PASSWORD"): + with self.subTest(password=password): + cfg = configuration() + cfg["services"]["moyi-api"]["environment"]["ADMIN_PASSWORD"] = password + with self.assertRaisesRegex(ValueError, "ADMIN_PASSWORD"): + deploy.validate_config(cfg, "tunnel") + + def test_cryptographic_secrets_keep_minimum_length(self): + for key in ("AUTH_PASSWORD_PEPPER", "CREDENTIAL_ENCRYPTION_KEY"): + with self.subTest(key=key): + cfg = configuration() + cfg["services"]["moyi-api"]["environment"][key] = "s" * 31 + with self.assertRaisesRegex(ValueError, key + " is too short"): + deploy.validate_config(cfg, "tunnel") + cfg["services"]["moyi-api"]["environment"][key] = "s" * 32 + deploy.validate_config(cfg, "tunnel") + def test_reject_placeholder(self): cfg = configuration() cfg["services"]["moyi-api"]["environment"]["MOYI_REDIS_HOST"] = "CHANGE_ME_TAIR_HOST" @@ -146,7 +174,7 @@ class DeploymentTests(unittest.TestCase): "CHANGE_ME_RDS_HOST": "rds.internal", "CHANGE_ME_RDS_PASSWORD": "test-db-$value#literal", "CHANGE_ME_TAIR_HOST": "redis.internal", "CHANGE_ME_TAIR_PASSWORD": "test-cache-$value#literal", "GENERATE_AUTH_PEPPER": "p" * 64, "GENERATE_CREDENTIAL_KEY": "k" * 64, - "GENERATE_ADMIN_PASSWORD": "test-only-admin-password", + "GENERATE_ADMIN_PASSWORD": "Qa-Test42!", } for before, after in replacements.items(): content = content.replace(before, after) @@ -160,6 +188,7 @@ class DeploymentTests(unittest.TestCase): api = cfg["services"]["moyi-api"]["environment"] self.assertEqual(api["MOYI_REDIS_PASSWORD"], "test-cache-$value#literal") self.assertEqual(api["SPRING_DATASOURCE_PASSWORD"], "test-db-$value#literal") + self.assertEqual(api["ADMIN_PASSWORD"], "Qa-Test42!") self.assertNotIn("MOYI_REDIS_PASSWORD", cfg["services"]["frontend"].get("environment", {})) self.assertNotIn("OSS_ACCESS_KEY_SECRET", api) if mode == "https":