mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 16:00:43 +00:00
xmz7891
9b17129c49
上一版把明文密码换成随机生成时，引入了三个问题。都是我自己的补丁
造成的，而且症状都像"功能坏了"，实际是环境和脚本的问题。
== bug 1：兜底替换把函数调用塞进了字符串 ==
fix_hardcoded_password.py 里有句兜底：
text = text.replace(OLD, '_admin_password()')
而原代码是：
{"username": "xmz7891", "password": "@<老密码>"}
^ @ 在引号**里面**
正则要求引号紧贴老密码，这里中间有个 @，所以没匹配上；
兜底替换就把老密码换成了函数调用，结果成了**字符串字面量**：
{"username": "xmz7891", "password": "@_admin_password()"}
7 个文件被这样弄坏。它们拿这串东西当密码去登录，
当然登不上 -> 401「请先登录」-> 管理接口测试全红（12 项失败）。
教训：**批量替换里的兜底 str.replace 太危险**，它不看上下文。
替换完必须检查有没有"函数调用被引号包起来"这种形状。
== bug 2：测试和它自己起的中转对不上密码 ==
密码改成随机生成之后，测试分成两边：
* 测试进程：_admin_password() 去环境变量/文件里找
* 它启动的中转：找不到就随机生成一个
两边不一致 -> 登录失败。
修法：测试在**模块级**（import 时）生成一个本次运行专用的随机密码，
写进 os.environ["RELAY_ADMIN_PASSWORD"]。测试启动中转用的是
dict(os.environ)，所以会自动传过去 —— 两边就是同一个密码。
用随机而不是写死：写死就又变成"密码进仓库"了，白改一场。
== bug 3：全新部署启动后没有密码文件 ==
admin_password() 原来只在有人访问登录页时才调用，于是全新部署
启动后 data/admin_password.txt 一直不存在，日志里也看不到密码，
管理员不知道该用什么登。
修法：main() 里在 admin_key() 后面补一句 admin_password()，
和钥匙一样的道理 —— 启动时生成并打印一次。
== 验证 ==
管理页设备控制 23/23 通过
管理页批删 24/24 通过
管理页按钮 10/10 通过
管理页 JS 通过
管理页网络体检 15/15 通过
密码随机生成 11/11 通过（含"老密码登不进去"、"两次部署密码不同"）
工作区搜不到明文密码了（git 历史里还有，等用户确认后重写）。
243 lines
8.5 KiB
Python
243 lines
8.5 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""真正解析一遍生成的 JS，确认没有跨行字符串。
|
||
|
||
上次的"复核"是简单的数引号，不准。
|
||
这次写个正经的扫描器：按字符走，处理转义、注释、模板串。
|
||
|
||
顺便：如果有 node，直接用 node --check 验证语法（最权威）。
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import os
|
||
import shutil
|
||
import subprocess
|
||
import sys
|
||
import tempfile
|
||
import time
|
||
import urllib.error
|
||
import urllib.request
|
||
import http.cookiejar
|
||
import urllib.parse
|
||
import json
|
||
from pathlib import Path
|
||
|
||
ROOT = Path(__file__).resolve().parent.parent
|
||
UA = {"User-Agent": "LanRemote/1.4.0"}
|
||
PORT = 8099
|
||
BASE = f"http://127.0.0.1:{PORT}"
|
||
|
||
|
||
# ---------------------------------------------------------------------------
|
||
# 管理页密码**不再硬编码**。
|
||
#
|
||
# 以前这里写着明文密码，而 relay.py 里也把它当默认密码 ——
|
||
# 仓库要推到公开的 Gitee/EzHub，等于把管理台钥匙挂门上，
|
||
# 而且 git 历史删不掉。
|
||
#
|
||
# 现在按优先级取：
|
||
# 1. 环境变量 RELAY_ADMIN_PASSWORD
|
||
# 2. _build/relay_info.json 里的 adminPassword（本地测试用）
|
||
# 3. 本机 8080 中转实际用的 data/admin_password.txt
|
||
# 拿不到就跳过需要登录的用例，而不是编一个假密码硬试。
|
||
# ---------------------------------------------------------------------------
|
||
# ---- 测试专用管理密码 ----------------------------------------------------
|
||
# 测试要登录它自己启动的中转，但密码是那边随机的 —— 两边对不上就会
|
||
# 全部 401（表现成"功能坏了"，实际是环境没打通）。
|
||
#
|
||
# 这里生成一个**本次运行专用**的随机密码，写进环境变量；
|
||
# 测试启动中转用的是 dict(os.environ)，所以会自动传给中转。
|
||
#
|
||
# 为什么不用写死的：写死就又变成"密码进仓库"了，白改一场。
|
||
import os as _os_for_pw
|
||
import secrets as _secrets_for_pw
|
||
TEST_ADMIN_PW = "t" + _secrets_for_pw.token_hex(12)
|
||
_os_for_pw.environ["RELAY_ADMIN_PASSWORD"] = TEST_ADMIN_PW
|
||
_os_for_pw.environ.setdefault("RELAY_ADMIN_USER", "xmz7891")
|
||
# ---------------------------------------------------------------------------
|
||
|
||
|
||
def _admin_password() -> str:
|
||
import json as _json
|
||
import os as _os
|
||
from pathlib import Path as _Path
|
||
|
||
pw = (_os.environ.get("RELAY_ADMIN_PASSWORD") or "").strip()
|
||
if pw:
|
||
return pw
|
||
root = _Path(__file__).resolve().parent.parent
|
||
info = root / "_build" / "relay_info.json"
|
||
try:
|
||
data = _json.loads(info.read_text(encoding="utf-8"))
|
||
pw = str(data.get("adminPassword") or "").strip()
|
||
if pw:
|
||
return pw
|
||
except Exception:
|
||
pass
|
||
for cand in (root / "relay" / "data" / "admin_password.txt",
|
||
_Path("/root/lanremote-relay/data/admin_password.txt")):
|
||
try:
|
||
if cand.is_file():
|
||
return cand.read_text(encoding="utf-8").strip()
|
||
except Exception:
|
||
continue
|
||
return ""
|
||
|
||
|
||
|
||
def scan_js_literals(script: str) -> list:
|
||
"""扫出跨行的字符串字面量，返回 [(行号, 片段)]。"""
|
||
problems = []
|
||
i = 0
|
||
n = len(script)
|
||
line = 1
|
||
while i < n:
|
||
ch = script[i]
|
||
if ch == "\n":
|
||
line += 1
|
||
i += 1
|
||
continue
|
||
# 行注释
|
||
if ch == "/" and i + 1 < n and script[i + 1] == "/":
|
||
while i < n and script[i] != "\n":
|
||
i += 1
|
||
continue
|
||
# 块注释
|
||
if ch == "/" and i + 1 < n and script[i + 1] == "*":
|
||
i += 2
|
||
while i + 1 < n and not (script[i] == "*" and script[i + 1] == "/"):
|
||
if script[i] == "\n":
|
||
line += 1
|
||
i += 1
|
||
i += 2
|
||
continue
|
||
# 字符串
|
||
if ch in ("'", '"', "`"):
|
||
quote = ch
|
||
start_line = line
|
||
start_i = i
|
||
i += 1
|
||
closed = False
|
||
while i < n:
|
||
c = script[i]
|
||
if c == "\\":
|
||
i += 2
|
||
continue
|
||
if c == "\n":
|
||
if quote == "`":
|
||
line += 1
|
||
i += 1
|
||
continue
|
||
break
|
||
if c == quote:
|
||
closed = True
|
||
i += 1
|
||
break
|
||
i += 1
|
||
if not closed:
|
||
snippet = script[start_i:start_i + 60].replace("\n", "\\n")
|
||
problems.append((start_line, snippet))
|
||
continue
|
||
i += 1
|
||
return problems
|
||
|
||
|
||
def main() -> int:
|
||
work = Path(tempfile.mkdtemp(prefix="jscheck_"))
|
||
relay = None
|
||
try:
|
||
data = work / "d"
|
||
data.mkdir(parents=True, exist_ok=True)
|
||
env = dict(os.environ)
|
||
env.update({"RELAY_PORT": str(PORT), "RELAY_BIND": "127.0.0.1",
|
||
"RELAY_DATA": str(data),
|
||
"PYTHONIOENCODING": "utf-8", "PYTHONUNBUFFERED": "1"})
|
||
relay = subprocess.Popen(
|
||
[sys.executable, "-u", str(ROOT / "relay" / "relay.py")], env=env,
|
||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||
for _ in range(40):
|
||
time.sleep(0.5)
|
||
try:
|
||
urllib.request.urlopen(
|
||
urllib.request.Request(BASE + "/v1/health", headers=UA),
|
||
timeout=2)
|
||
break
|
||
except Exception: # noqa: BLE001
|
||
continue
|
||
|
||
body = json.dumps({"deviceId": "pc-js", "code": "333444",
|
||
"name": "测试电脑", "version": "1.4.0"}).encode()
|
||
urllib.request.urlopen(urllib.request.Request(
|
||
BASE + "/v1/agent/register", data=body, method="POST",
|
||
headers={**UA, "Content-Type": "application/json"}), timeout=10
|
||
).read()
|
||
|
||
jar = http.cookiejar.CookieJar()
|
||
opener = urllib.request.build_opener(
|
||
urllib.request.HTTPCookieProcessor(jar))
|
||
form = urllib.parse.urlencode({"username": "xmz7891", "password": _admin_password()}).encode()
|
||
req = urllib.request.Request(BASE + "/admin/login", data=form,
|
||
method="POST", headers=UA)
|
||
req.add_header("Content-Type", "application/x-www-form-urlencoded")
|
||
try:
|
||
opener.open(req, timeout=10).read()
|
||
except urllib.error.HTTPError:
|
||
pass
|
||
|
||
html = opener.open(urllib.request.Request(BASE + "/zhongzhuanzhan", headers=UA),
|
||
timeout=10).read().decode("utf-8")
|
||
|
||
start = html.find("<script>")
|
||
end = html.find("</script>", start)
|
||
if start < 0:
|
||
print(" [FAIL] 页面里没有 script")
|
||
return 1
|
||
script = html[start + len("<script>"):end]
|
||
print(f" JS 长度 {len(script)} 字符，{len(script.splitlines())} 行")
|
||
|
||
bad = scan_js_literals(script)
|
||
if bad:
|
||
print(f" [FAIL] 有 {len(bad)} 处跨行字符串字面量：")
|
||
for line, snippet in bad:
|
||
print(f" 第 {line} 行: {snippet}")
|
||
else:
|
||
print(" ✓ 没有跨行字符串字面量")
|
||
|
||
# 有 node 的话用它做权威校验
|
||
node = shutil.which("node")
|
||
if node:
|
||
jsfile = work / "check.js"
|
||
jsfile.write_text(script, encoding="utf-8")
|
||
proc = subprocess.run([node, "--check", str(jsfile)],
|
||
capture_output=True, text=True,
|
||
encoding="utf-8", errors="replace")
|
||
if proc.returncode == 0:
|
||
print(" ✓ node --check 语法通过")
|
||
else:
|
||
print(f" [FAIL] node --check 报错：{proc.stderr[:300]}")
|
||
bad.append((-1, "node"))
|
||
else:
|
||
print(" （本机没有 node，跳过 --check）")
|
||
|
||
print()
|
||
if bad:
|
||
print(" 结论：JS 有语法错误 —— 按钮点了没反应就是这个原因")
|
||
return 1
|
||
print(" 结论：JS 合法，删除按钮能正常工作")
|
||
return 0
|
||
finally:
|
||
if relay is not None:
|
||
try:
|
||
relay.terminate()
|
||
relay.wait(timeout=8)
|
||
except Exception: # noqa: BLE001
|
||
try:
|
||
relay.kill()
|
||
except Exception: # noqa: BLE001
|
||
pass
|
||
time.sleep(0.5)
|
||
shutil.rmtree(work, ignore_errors=True)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
sys.exit(main())
|