补齐管理员恢复验收证据并严格校验反代跳转

This commit is contained in:
xuans committed 2026-09-18 03:03:46 +08:00
1 parent d4afc20272
commit 4b5deb31b9
5 files changed
+176 -9

No files matched your search

@@ -0,0 +1,56 @@
'''验证反代验收同时约束公网与上游跳转,不访问真实网络。'''
from pathlib import Path
import sys
import unittest
from unittest.mock import patch
sys.path.insert(0, str(Path(__file__).resolve().parent))
import verify_nginx_tls as verify
class RedirectAcceptanceTest(unittest.TestCase):
expected = 'https://mail.solit.cn/acceptance?x=1'
def check(self, first, second):
results = {'checks': []}
with patch.object(verify, 'request', side_effect=[first, second]) as request:
failures = verify.check_redirects(results)
self.assertEqual(request.call_count, 2)
self.assertEqual([call.args[0] for call in request.call_args_list], [80, 8001])
self.assertEqual(len(results['checks']), 2)
return failures
def response(self, location=None, status=308):
return status, {'Location': location or self.expected}, b''
def test_both_ports_use_public_address(self):
self.assertEqual(self.check(self.response(), self.response()), [])
def test_internal_https_port_is_failure(self):
failures = self.check(self.response(), self.response('https://mail.solit.cn:8002/acceptance?x=1'))
self.assertEqual(len(failures), 1)
self.assertEqual(failures[0]['port'], 8001)
def test_public_port_does_not_skip_validation(self):
failures = self.check(self.response('http://mail.solit.cn/acceptance?x=1'), self.response())
self.assertEqual([item['port'] for item in failures], [80])
def test_missing_location_records_failure(self):
failures = self.check(self.response(), (308, {}, b''))
self.assertIsNone(failures[0]['actualLocation'])
def test_wrong_status_is_failure(self):
failures = self.check(self.response(), self.response(status=200))
self.assertEqual(failures[0]['actualStatus'], 200)
def test_path_and_query_must_be_preserved(self):
for location in ('https://mail.solit.cn/', 'https://mail.solit.cn/acceptance',
'https://other.invalid/acceptance?x=1'):
with self.subTest(location=location):
self.assertTrue(self.check(self.response(), self.response(location)))
if __name__ == '__main__':
unittest.main()
+18 -9
View File
@@ -28,6 +28,20 @@ def request(port, path='/', host=HOST, tls=True):
stream.close()
def check_redirects(results):
expected = 'https://' + HOST + '/acceptance?x=1'
failures = []
for port in (80, 8001):
status, headers, _ = request(port, '/acceptance?x=1', tls=False)
location = headers.get('Location')
results['checks'].append({'port': port, 'redirect': location, 'status': status})
if status != 308 or location != expected:
failures.append({'port': port, 'check': 'public_redirect',
'expectedStatus': 308, 'actualStatus': status,
'expectedLocation': expected, 'actualLocation': location})
return failures
def main():
results = {'time': datetime.now(timezone.utc).isoformat(), 'checks': []}
leaf = subprocess.run(['openssl', 'x509', '-in', '/opt/smail/ssl/custom.crt', '-outform', 'DER'],
@@ -60,13 +74,7 @@ def main():
results['checks'].append({'port': port, 'pageStatus': status, 'pageBytes': len(body)})
status, _, body = request(port, '/api/ping')
assert status == 200
for port in (80, 8001):
status, headers, _ = request(port, '/acceptance?x=1', tls=False)
assert status == 308
location = headers['Location']
if port == 80:
assert location == 'https://mail.solit.cn/acceptance?x=1'
results['checks'].append({'port': port, 'redirect': location})
results['failures'] = check_redirects(results)
assert request(80, host='untrusted.invalid', tls=False)[0] == 404
results['checks'].append({'unknownHttpHost': 'rejected'})
try:
@@ -80,9 +88,10 @@ def main():
assert root['http']['port'] == 8001 and root['http']['httpsPort'] == 8002
assert root['security']['webAuthnRpOrigins'] == ['https://mail.solit.cn']
results['fingerprintSHA256'] = expected
results['status'] = 'passed'
results['status'] = 'failed' if results['failures'] else 'passed'
print(json.dumps(results, ensure_ascii=False, indent=2))
return int(bool(results['failures']))
if __name__ == '__main__':
main()
raise SystemExit(main())