feat: 账号制管理员系统 — 默认管理员jinghui自动初始化, 管理后台账号登录, 用户列表/添加/删除/改密/升降角色/禁用启用, ADMIN_TOKEN保留为应急通道
This commit is contained in:
1 parent
0afbd42fdf
commit
aaa2eaa834
4 files changed
+397
-24
No files matched your search
@@ -632,6 +632,8 @@ def _db():
|
||||
"ALTER TABLE users ADD COLUMN card_key TEXT DEFAULT ''",
|
||||
"ALTER TABLE users ADD COLUMN origin_machine TEXT DEFAULT ''",
|
||||
"ALTER TABLE users ADD COLUMN bound_machines TEXT DEFAULT '[]'",
|
||||
"ALTER TABLE users ADD COLUMN role TEXT DEFAULT 'user'",
|
||||
"ALTER TABLE users ADD COLUMN disabled INTEGER DEFAULT 0",
|
||||
):
|
||||
try:
|
||||
conn.execute(stmt)
|
||||
@@ -641,6 +643,30 @@ def _db():
|
||||
return conn
|
||||
|
||||
|
||||
DEFAULT_ADMIN = os.environ.get("DEFAULT_ADMIN_USER", "jinghui")
|
||||
DEFAULT_ADMIN_PW = os.environ.get("DEFAULT_ADMIN_PW", "a3396336")
|
||||
|
||||
|
||||
def _ensure_admin():
|
||||
"""create the default admin account on first boot"""
|
||||
try:
|
||||
conn = _db()
|
||||
row = conn.execute("SELECT username FROM users WHERE username=?", (DEFAULT_ADMIN,)).fetchone()
|
||||
if not row:
|
||||
salt = secrets.token_hex(16)
|
||||
conn.execute(
|
||||
"INSERT INTO users (username, salt, pw_hash, created, role) VALUES (?,?,?,?,'admin')",
|
||||
(DEFAULT_ADMIN, salt, _hash_pw(DEFAULT_ADMIN_PW, salt), time.time()),
|
||||
)
|
||||
conn.commit()
|
||||
else:
|
||||
conn.execute("UPDATE users SET role='admin' WHERE username=?", (DEFAULT_ADMIN,))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def _bind_machine(username: str, machine: str):
|
||||
"""remember devices that logged into this account (max 10)"""
|
||||
if not machine or not MACHINE_RE.match(machine):
|
||||
@@ -659,6 +685,23 @@ def _bind_machine(username: str, machine: str):
|
||||
conn.close()
|
||||
|
||||
|
||||
def _user_attr(username: str):
|
||||
"""returns (role, disabled)"""
|
||||
try:
|
||||
conn = _db()
|
||||
row = conn.execute("SELECT role, disabled FROM users WHERE username=?", (username,)).fetchone()
|
||||
conn.close()
|
||||
if row:
|
||||
return (row[0] or "user"), bool(row[1])
|
||||
except Exception:
|
||||
pass
|
||||
return "user", False
|
||||
|
||||
|
||||
def _user_disabled(username: str) -> bool:
|
||||
return _user_attr(username)[1]
|
||||
|
||||
|
||||
def _save_user_license(username: str, card_key: str, machine: str):
|
||||
"""store the card bound to this account after a successful activation"""
|
||||
conn = _db()
|
||||
@@ -775,10 +818,19 @@ USER_NAME_RE = re.compile(r"^[A-Za-z0-9_\u4e00-\u9fa5-]{3,32}$")
|
||||
|
||||
|
||||
def _admin_auth(handler) -> bool:
|
||||
if not ADMIN_TOKEN:
|
||||
return False
|
||||
# channel 1: configured admin token (bootstrap / emergency)
|
||||
tok = handler.headers.get("X-Admin-Token", "")
|
||||
return bool(tok) and tok == ADMIN_TOKEN
|
||||
if ADMIN_TOKEN and tok and tok == ADMIN_TOKEN:
|
||||
return True
|
||||
# channel 2: logged-in admin account
|
||||
auth = handler.headers.get("Authorization", "")
|
||||
if auth.lower().startswith("bearer "):
|
||||
acc = _parse_token(auth[7:])
|
||||
if acc:
|
||||
role, disabled = _user_attr(acc)
|
||||
if role == "admin" and not disabled:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def admin_api(method: str, sub: str, payload: dict, handler):
|
||||
@@ -788,12 +840,12 @@ def admin_api(method: str, sub: str, payload: dict, handler):
|
||||
|
||||
if method == "GET" and sub == "/overview":
|
||||
conn = _db()
|
||||
users = conn.execute("SELECT username, created, card_key, bound_machines FROM users").fetchall()
|
||||
users = conn.execute("SELECT username, created, card_key, bound_machines, role, disabled FROM users").fetchall()
|
||||
conn.close()
|
||||
out_users = []
|
||||
total_files = 0
|
||||
total_size = 0
|
||||
for username, created, card_key, bm in users:
|
||||
for username, created, card_key, bm, role, disabled in users:
|
||||
udir = os.path.join(USERS_ROOT, username)
|
||||
fdir = os.path.join(udir, "files")
|
||||
fcount = 0
|
||||
@@ -827,6 +879,8 @@ def admin_api(method: str, sub: str, payload: dict, handler):
|
||||
"total_size": fsize + dsize,
|
||||
"devices": len(machines),
|
||||
"licensed": bool(card_key),
|
||||
"role": role or "user",
|
||||
"disabled": bool(disabled),
|
||||
})
|
||||
out_users.sort(key=lambda x: -x["total_size"])
|
||||
return 200, {"code": 200, "message": "ok", "data": {
|
||||
@@ -918,6 +972,89 @@ def admin_api(method: str, sub: str, payload: dict, handler):
|
||||
conn.close()
|
||||
return 200, {"code": 200, "message": "ok", "data": {"freed": size}}
|
||||
|
||||
if method == "POST" and sub == "/user-create":
|
||||
username = str(payload.get("username") or "").strip()
|
||||
password = str(payload.get("password") or "")
|
||||
role = "admin" if payload.get("role") == "admin" else "user"
|
||||
if not USER_NAME_RE.match(username):
|
||||
return 400, {"code": 400, "message": "用户名需 3-32 位字母/数字/下划线/中文"}
|
||||
if len(password) < 6:
|
||||
return 400, {"code": 400, "message": "密码至少 6 位"}
|
||||
salt = secrets.token_hex(16)
|
||||
try:
|
||||
conn = _db()
|
||||
conn.execute("INSERT INTO users (username, salt, pw_hash, created, role) VALUES (?,?,?,?,?)",
|
||||
(username, salt, _hash_pw(password, salt), time.time(), role))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
except sqlite3.IntegrityError:
|
||||
return 409, {"code": 409, "message": "用户名已存在"}
|
||||
_user_dir(username)
|
||||
return 200, {"code": 200, "message": "ok"}
|
||||
|
||||
if method == "POST" and sub == "/user-update":
|
||||
username = str(payload.get("username") or "").strip()
|
||||
if not username:
|
||||
return 400, {"code": 400, "message": "缺少用户名"}
|
||||
conn = _db()
|
||||
row = conn.execute("SELECT username FROM users WHERE username=?", (username,)).fetchone()
|
||||
if not row:
|
||||
conn.close()
|
||||
return 404, {"code": 404, "message": "用户不存在"}
|
||||
sets = []
|
||||
args = []
|
||||
new_pw = str(payload.get("password") or "")
|
||||
if new_pw:
|
||||
if len(new_pw) < 6:
|
||||
conn.close()
|
||||
return 400, {"code": 400, "message": "密码至少 6 位"}
|
||||
salt = secrets.token_hex(16)
|
||||
sets += ["salt=?", "pw_hash=?"]
|
||||
args += [salt, _hash_pw(new_pw, salt)]
|
||||
if "role" in payload:
|
||||
role = "admin" if payload.get("role") == "admin" else "user"
|
||||
# do not demote the default admin
|
||||
if username == DEFAULT_ADMIN and role != "admin":
|
||||
conn.close()
|
||||
return 400, {"code": 400, "message": "默认管理员不可降级"}
|
||||
sets += ["role=?"]
|
||||
args.append(role)
|
||||
if "disabled" in payload:
|
||||
disabled = 1 if payload.get("disabled") else 0
|
||||
if username == DEFAULT_ADMIN and disabled:
|
||||
conn.close()
|
||||
return 400, {"code": 400, "message": "默认管理员不可禁用"}
|
||||
sets += ["disabled=?"]
|
||||
args.append(disabled)
|
||||
if not sets:
|
||||
conn.close()
|
||||
return 400, {"code": 400, "message": "没有要修改的内容"}
|
||||
args.append(username)
|
||||
conn.execute(f"UPDATE users SET {', '.join(sets)} WHERE username=?", args)
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return 200, {"code": 200, "message": "ok"}
|
||||
|
||||
if method == "POST" and sub == "/user-delete":
|
||||
username = str(payload.get("username") or "").strip()
|
||||
if not username:
|
||||
return 400, {"code": 400, "message": "缺少用户名"}
|
||||
if username == DEFAULT_ADMIN:
|
||||
return 400, {"code": 400, "message": "默认管理员不可删除"}
|
||||
conn = _db()
|
||||
row = conn.execute("SELECT username FROM users WHERE username=?", (username,)).fetchone()
|
||||
if not row:
|
||||
conn.close()
|
||||
return 404, {"code": 404, "message": "用户不存在"}
|
||||
conn.execute("DELETE FROM users WHERE username=?", (username,))
|
||||
conn.execute("DELETE FROM files WHERE username=?", (username,))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
udir = os.path.join(USERS_ROOT, username)
|
||||
if os.path.isdir(udir):
|
||||
shutil.rmtree(udir, ignore_errors=True)
|
||||
return 200, {"code": 200, "message": "ok"}
|
||||
|
||||
if method == "GET" and sub == "/usage":
|
||||
qs = parse.parse_qs(parse.urlparse(handler.path).query)
|
||||
days = _int_str((qs.get("days") or ["7"])[0], 1, 365, 7)
|
||||
@@ -977,15 +1114,21 @@ def user_api(method, sub, payload, handler):
|
||||
return 401, {"code": 401, "message": "用户名或密码错误"}
|
||||
_user_dir(username)
|
||||
_bind_machine(username, _req_machine(handler))
|
||||
return 200, {"code": 200, "message": "ok", "data": {"token": _make_token(username), "username": username}}
|
||||
role, disabled = _user_attr(username)
|
||||
if disabled:
|
||||
return 403, {"code": 403, "message": "账号已被禁用,请联系管理员"}
|
||||
return 200, {"code": 200, "message": "ok", "data": {"token": _make_token(username), "username": username, "role": role or "user"}}
|
||||
|
||||
# ---- below requires auth ----
|
||||
username = _auth_user(handler)
|
||||
if not username:
|
||||
return 401, {"code": 401, "message": "请先登录"}
|
||||
if _user_disabled(username):
|
||||
return 403, {"code": 403, "message": "账号已被禁用,请联系管理员"}
|
||||
|
||||
if method == "GET" and sub == "/me":
|
||||
return 200, {"code": 200, "message": "ok", "data": {"username": username}}
|
||||
role, _d = _user_attr(username)
|
||||
return 200, {"code": 200, "message": "ok", "data": {"username": username, "role": role}}
|
||||
|
||||
if method == "GET" and sub == "/data":
|
||||
path = os.path.join(_user_dir(username), "data.json")
|
||||
@@ -1238,9 +1381,18 @@ class Handler(BaseHTTPRequestHandler):
|
||||
return
|
||||
op = (fs["op"].value if "op" in fs.keys() else "") or ""
|
||||
params = {}
|
||||
wm_bytes = None
|
||||
wm_name = ""
|
||||
for k in fs.keys():
|
||||
if k not in ("file", "op"):
|
||||
params[k] = fs[k].value
|
||||
item = fs[k]
|
||||
if k == "file" or k == "op":
|
||||
continue
|
||||
if getattr(item, "filename", None):
|
||||
if k == "wm_file":
|
||||
wm_bytes = item.file.read()
|
||||
wm_name = os.path.basename(item.filename or "wm.png")
|
||||
continue
|
||||
params[k] = item.value
|
||||
fdata = fobj.file.read()
|
||||
if not fdata:
|
||||
self._reply(400, json.dumps({"code": 400, "message": "文件为空"}, ensure_ascii=False).encode(), "application/json")
|
||||
@@ -1535,4 +1687,5 @@ class Handler(BaseHTTPRequestHandler):
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
_ensure_admin()
|
||||
ThreadingHTTPServer(("0.0.0.0", 8091), Handler).serve_forever()
|
||||
Reference in new issue
Block a user