补齐远程六十包分批验收并防止空测试误报
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-17 11:28:52 +08:00
1 parent 1b2ba5a6a1
commit 421aa7303d
5 files changed
+175 -22

No files matched your search

+50 -19
View File
@@ -4,6 +4,7 @@ import argparse
import json
import os
from pathlib import Path
import re
import signal
import subprocess
import time
@@ -13,7 +14,10 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument('--only', action='append', default=[])
parser.add_argument('--run', default='')
parser.add_argument('--per-test', action='store_true')
args = parser.parse_args()
if args.per_test and args.run:
parser.error('逐用例模式不能同时使用正则筛选')
root = Path(__file__).resolve().parent
assert root.parent == Path('/var/tmp') and root.name.startswith('smail-review-')
assert os.geteuid() != 0, '禁止使用 root 执行测试'
@@ -24,10 +28,16 @@ def main():
environment['GOMAXPROCS'] = '1'
environment['GOMEMLIMIT'] = '64MiB'
environment['GOGC'] = '20'
manifest = json.loads((root / 'manifest.json').read_text(encoding='utf-8'))
if not manifest:
parser.error('测试清单为空')
unknown = set(args.only) - {item['directory'] for item in manifest}
if unknown:
parser.error('测试包不存在:' + ', '.join(sorted(unknown)))
output = root / ('results-' + time.strftime('%Y%m%d-%H%M%S'))
output.mkdir(mode=0o700)
results = []
for item in json.loads((root / 'manifest.json').read_text(encoding='utf-8')):
for item in manifest:
if args.only and item['directory'] not in args.only:
continue
directory = (root / item['directory']).resolve()
@@ -37,26 +47,47 @@ def main():
assert stream.read(5) == b'\x7fELF\x02'
started = time.monotonic()
log = output / (item['directory'].replace('/', '-') + '.log')
with log.open('w', encoding='utf-8') as stream:
command = [str(binary), '-test.v', '-test.timeout=180s']
if args.run:
command.append('-test.run=' + args.run)
process = subprocess.Popen(command, cwd=directory, env=environment,
stdout=stream, stderr=subprocess.STDOUT, start_new_session=True)
try:
code = process.wait(timeout=195)
except subprocess.TimeoutExpired:
os.killpg(process.pid, signal.SIGKILL)
process.wait()
code = 124
lines = log.read_text(encoding='utf-8', errors='replace').splitlines()
result = dict(item, code=code, log=str(log), seconds=round(time.monotonic() - started, 2),
passed=sum(line.startswith('--- PASS:') for line in lines),
failed=[line for line in lines if line.lstrip().startswith('--- FAIL:')],
skipped=[line for line in lines if line.lstrip().startswith('--- SKIP:')])
patterns = [args.run]
if args.per_test:
listing = subprocess.check_output([str(binary), '-test.list=.'], cwd=directory,
env=environment, text=True, timeout=30)
names = [line for line in listing.splitlines()
if re.fullmatch(r'(?:Test|Example|Fuzz)\w+', line)]
if not names:
raise RuntimeError('未发现可运行用例:' + item['directory'])
patterns = ['^' + re.escape(name) + '$' for name in names]
result = dict(item, code=None, log=str(log), status='running', per_test=args.per_test)
results.append(result)
summary = output / 'results.json'
summary.write_text(json.dumps(results, ensure_ascii=False, indent=2), encoding='utf-8')
code = 0
with log.open('w', encoding='utf-8') as stream:
for pattern in patterns:
command = [str(binary), '-test.v', '-test.timeout=180s']
if pattern:
command.append('-test.run=' + pattern)
process = subprocess.Popen(command, cwd=directory, env=environment,
stdout=stream, stderr=subprocess.STDOUT, start_new_session=True)
try:
current = process.wait(timeout=195)
except subprocess.TimeoutExpired:
os.killpg(process.pid, signal.SIGKILL)
process.wait()
current = 124
if current != 0:
code = current
lines = log.read_text(encoding='utf-8', errors='replace').splitlines()
passed = sum(line.startswith('--- PASS:') for line in lines)
skipped = [line for line in lines if line.lstrip().startswith('--- SKIP:')]
if not passed and not skipped and code == 0:
code = 2
if args.per_test and passed + sum(line.startswith('--- SKIP:') for line in lines) != len(patterns):
code = code or 2
result.update(code=code, status='finished', seconds=round(time.monotonic() - started, 2),
passed=passed, failed=[line for line in lines if line.lstrip().startswith('--- FAIL:')],
skipped=skipped)
print(json.dumps(result, ensure_ascii=False), flush=True)
(output / 'results.json').write_text(json.dumps(results, ensure_ascii=False, indent=2), encoding='utf-8')
summary.write_text(json.dumps(results, ensure_ascii=False, indent=2), encoding='utf-8')
print('测试记录:' + str(output), flush=True)
return int(any(item['code'] != 0 for item in results))
+4 -1
View File
@@ -12,7 +12,8 @@ def main():
parser.add_argument('directory')
parser.add_argument('--only', action='append', default=[])
parser.add_argument('--run', default='')
parser.add_argument('--memory-mib', type=int, choices=(64, 96, 128, 192), default=192)
parser.add_argument('--per-test', action='store_true')
parser.add_argument('--memory-mib', type=int, choices=(64, 96, 128, 192), default=128)
args = parser.parse_args()
root = Path(args.directory).resolve(strict=True)
assert os.geteuid() == 0
@@ -39,6 +40,8 @@ def main():
command.extend(['--only', directory])
if args.run:
command.extend(['--run', args.run])
if args.per_test:
command.append('--per-test')
print('测试服务:' + unit, flush=True)
return subprocess.run(command).returncode
+95
View File
@@ -0,0 +1,95 @@
"""只读核对远程分批测试覆盖及线上服务,不输出邮件、密码或会话内容。"""
import argparse
import hashlib
import json
import os
from pathlib import Path
import sqlite3
import stat
import subprocess
def run(*args):
return subprocess.check_output(args, text=True).strip()
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--results', nargs='+', default=[])
parser.add_argument('--main-sha')
parser.add_argument('--admin-sha')
parser.add_argument('--since', required=True)
args = parser.parse_args()
assert os.geteuid() == 0 and run('hostname') == 'ikun2'
root = Path('/opt/smail')
assert root.resolve() == root
summary = {}
if args.results:
test_root = Path('/var/tmp/smail-review-full-20260917')
expected = {item['directory'] for item in json.loads((test_root / 'manifest.json').read_text())}
completed = {}
for name in args.results:
directory = (test_root / name).resolve(strict=True)
assert directory.parent == test_root and directory.name.startswith('results-')
for item in json.loads((directory / 'results.json').read_text()):
assert item.get('code') == 0 and not item.get('failed'), '测试未通过或被中断'
assert item['directory'] not in completed, '测试包结果重复'
completed[item['directory']] = item
assert set(completed) == expected, '测试包覆盖不完整'
summary['tests'] = {
'packages': len(completed),
'passed': sum(item['passed'] for item in completed.values()),
'skipped': {name: item['skipped'] for name, item in completed.items() if item['skipped']},
'per_test': [name for name, item in completed.items() if item.get('per_test')],
'evidence': args.results,
}
services = {}
for name in ('smail.service', 'mysql.service', 'Scert.service'):
properties = run('systemctl', 'show', name, '--property=ActiveState,SubState,MainPID,NRestarts,ExecMainStatus')
services[name] = dict(line.split('=', 1) for line in properties.splitlines())
assert services[name]['ActiveState'] == 'active'
summary['services'] = services
for name, checksum in (('smail', args.main_sha), ('smail-admin', args.admin_sha)):
if checksum:
with (root / name).open('rb') as stream:
actual = hashlib.file_digest(stream, 'sha256').hexdigest()
assert actual == checksum, '部署产物摘要不匹配'
summary[name + '_sha256'] = actual
summary['admin_version'] = run(str(root / 'smail-admin'), 'version')
summary['database_integrity'] = {}
for name in ('smail.db', 'smail-state.db'):
with sqlite3.connect(f'file:{root / "data" / name}?mode=ro', uri=True) as database:
integrity = database.execute('PRAGMA integrity_check').fetchall()
assert integrity == [('ok',)]
summary['database_integrity'][name] = 'ok'
with sqlite3.connect(f'file:{root / "data/smail.db"}?mode=ro', uri=True) as database:
summary['migration'] = database.execute('SELECT MAX(version) FROM schema_migration').fetchone()[0]
summary['queue_states'] = dict(database.execute('SELECT state,COUNT(*) FROM outbound_delivery GROUP BY state'))
control = Path('/run/smail/admin-control.sock').lstat()
assert stat.S_ISSOCK(control.st_mode) and stat.S_IMODE(control.st_mode) == 0o600
assert control.st_uid == (root / 'data/smail.db').stat().st_uid
summary['control_socket_mode'] = oct(stat.S_IMODE(control.st_mode))
curl = ['curl', '--silent', '--show-error', '--fail', '--max-time', '10', '--noproxy', '*',
'--cacert', str(root / 'ssl/custom.crt'), '--resolve', 'mail.solit.cn:443:127.0.0.1']
run(*curl, 'https://mail.solit.cn/api/ping')
summary['unauthenticated'] = {}
for endpoint in ('/api/v1/user/info', '/api/v1/email/list'):
response = json.loads(run(*curl, '-X', 'POST', 'https://mail.solit.cn' + endpoint))
assert response['errorNo'] == 403 and not response.get('data')
summary['unauthenticated'][endpoint] = response['errorNo']
entries = run('journalctl', '-u', 'smail.service', '--since', args.since, '--output=json', '--no-pager')
levels = {}
for line in entries.splitlines():
entry = json.loads(line)
priority = entry.get('PRIORITY', 'unknown')
levels[priority] = levels.get(priority, 0) + 1
summary['journal_priorities'] = levels
kernel = run('journalctl', '-k', '--since', args.since, '--no-pager')
summary['oom_events'] = sum('oom-kill:constraint=' in line for line in kernel.splitlines())
summary['global_oom_events'] = sum('oom-kill:constraint=CONSTRAINT_NONE' in line for line in kernel.splitlines())
print(json.dumps(summary, ensure_ascii=False, indent=2))
if __name__ == '__main__':
main()