修正后台域名与泛域名证书验收
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-22 07:18:43 +08:00
1 parent 2436894589
commit eb5758bd3b
7 files changed
+57 -18

No files matched your search

+12 -3
View File
@@ -17,7 +17,10 @@ import time
import uuid
DOMAINS = ('solit.cn', 'mail.solit.cn', 'smtp.solit.cn', 'imap.solit.cn', 'pop.solit.cn')
DOMAINS = ('solit.cn', '*.solit.cn')
VERIFY_HOSTNAMES = ('solit.cn', 'web.solit.cn', 'mail.solit.cn', 'smtp.solit.cn',
'imap.solit.cn', 'pop.solit.cn')
CERTIFICATE_SNI = 'web.solit.cn'
LINEAGE = Path('/var/lib/smail-acme-tls/certificates')
TARGET = Path('/opt/smail/ssl')
BACKUPS = Path('/var/backups')
@@ -96,7 +99,13 @@ def replace_file(path, data, uid, gid):
def validate(directory):
for domain in DOMAINS:
names = run('openssl', 'x509', '-in', str(directory / 'candidate.crt'), '-noout',
'-ext', 'subjectAltName').decode('utf-8')
certificate_domains = {item.strip()[4:] for line in names.splitlines()
for item in line.split(',') if item.strip().startswith('DNS:')}
if not set(DOMAINS).issubset(certificate_domains):
raise RuntimeError('证书必须同时覆盖根域名和泛域名')
for domain in VERIFY_HOSTNAMES:
run('openssl', 'verify', '-CAfile', CA_FILE, '-purpose', 'sslserver',
'-untrusted', str(directory / 'candidate.issuer.crt'), '-verify_hostname', domain,
str(directory / 'candidate.crt'))
@@ -119,7 +128,7 @@ def verify_live_certificate(fingerprint):
while True:
try:
with socket.create_connection(('127.0.0.1', port), timeout=2) as connection:
with context.wrap_socket(connection, server_hostname='mail.solit.cn') as secure:
with context.wrap_socket(connection, server_hostname=CERTIFICATE_SNI) as secure:
actual = hashlib.sha256(secure.getpeercert(binary_form=True)).hexdigest()
if actual == fingerprint:
break
+1 -1
View File
@@ -11,7 +11,7 @@ import deploy_certificate as deploy
ROOT = Path('/var/lib/smail-acme-tls')
DOMAINS = ('solit.cn', 'mail.solit.cn', 'smtp.solit.cn', 'imap.solit.cn', 'pop.solit.cn')
DOMAINS = deploy.DOMAINS
RENEW_TIMEOUT = 600
WEBROOT = Path('/var/lib/smail-acme')
+7 -6
View File
@@ -8,7 +8,7 @@ server {
server {
listen 80;
listen [::]:80;
server_name solit.cn mail.solit.cn smtp.solit.cn imap.solit.cn pop.solit.cn;
server_name solit.cn mail.solit.cn web.solit.cn smtp.solit.cn imap.solit.cn pop.solit.cn;
location ^~ /.well-known/acme-challenge/ {
root /var/lib/smail-acme;
@@ -17,7 +17,7 @@ server {
}
location / {
return 308 https://mail.solit.cn$request_uri;
return 308 https://web.solit.cn$request_uri;
}
}
@@ -31,16 +31,16 @@ server {
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name solit.cn smtp.solit.cn imap.solit.cn pop.solit.cn;
server_name solit.cn mail.solit.cn smtp.solit.cn imap.solit.cn pop.solit.cn;
ssl_certificate /opt/smail/ssl/custom.crt;
ssl_certificate_key /opt/smail/ssl/custom.key;
return 308 https://mail.solit.cn$request_uri;
return 308 https://web.solit.cn$request_uri;
}
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name mail.solit.cn;
server_name web.solit.cn;
ssl_certificate /opt/smail/ssl/custom.crt;
ssl_certificate_key /opt/smail/ssl/custom.key;
@@ -50,10 +50,11 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Connection "";
proxy_ssl_server_name on;
proxy_ssl_name mail.solit.cn;
proxy_ssl_name web.solit.cn;
proxy_ssl_verify on;
proxy_ssl_verify_depth 3;
proxy_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;