WIP-CHECKPOINT[auth-refactor]: 固化工程师崩溃前部分成果 + 同树其他未提交WIP（仅源码，不含密钥/二进制）-- 待重激活工程师续作

2026-07-07 21:52:11 +08:00
parent 242c1967ff
commit fab75760e0
203 changed files with 21504 additions and 3345 deletions
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+"""Add IP 115.227.36.10 to nginx whitelist"""
+
+with open('/opt/wecom-it-desk/nginx/nginx.conf', 'r') as f:
+    content = f.read()
+
+# Add after existing office IPs
+content = content.replace(
+    'allow 218.75.34.87;',
+    'allow 218.75.34.87;\n            allow 115.227.36.10;    # 新增办公网出口IP'
+)
+
+with open('/opt/wecom-it-desk/nginx/nginx.conf', 'w') as f:
+    f.write(content)
+
+print('Done')
@@ -112,8 +112,8 @@ http {
        # API 路由分发（根据路径选择上游服务）
        # ------------------------------------------------------------------

-        # Core 服务：认证、员工、角色
-        location ~ ^/api/(auth|employees|roles|mfa) {
+        # Core 服务：认证、员工、角色（包括 auth_qrcode 扫码登录）
+        location ~ ^/api/(auth|employees|roles|mfa|auth_qrcode) {
            proxy_pass http://core_backend;
            proxy_http_version 1.1;
            proxy_set_header Host $host;
@@ -8,40 +8,29 @@
 #   3. 真实 IP 直接从 $remote_addr 获取（无 CF 代理层）
 #   4. 预留 HTTPS 配置注释（如公司有统一 SSL 终端）
 # =============================================================================
-
 events {
    worker_connections 1024;
 }
-
 http {
    include       /etc/nginx/mime.types;
    default_type  application/octet-stream;
-
    # ------------------------------------------------------------------
    # 日志格式
    # ------------------------------------------------------------------
    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
                    '$status $body_bytes_sent "$http_referer" '
                    '"$http_user_agent"';
-
    access_log /var/log/nginx/access.log main;
    error_log  /var/log/nginx/error.log warn;
-
    # ------------------------------------------------------------------
    # 真实 IP 还原(2026-06-15 v0.5.1 修复)
    # ------------------------------------------------------------------
-    # 问题:公司有 WAF/堡垒机/反向代理,nginx 看到的 $remote_addr
-    #       是代理 IP(不在白名单),allow/deny 因此误判 403
-    # 修法:信任内网段代理透传的 X-Forwarded-For 头,用真实 IP 做白名单
-    # 注意:set_real_ip_from 是"我信任的代理",不是"我允许的客户端"
-    #       必须精确,否则攻击者可伪造 X-Forwarded-For 绕过白名单
    set_real_ip_from 10.0.0.0/8;          # 内网 A 类(代理/WAF 出口)
    set_real_ip_from 172.16.0.0/12;       # 内网 B 类
-    set_real_ip_from 192.168.0.0/16;      # 内网 C 类
+    set_real_ip_from 192.168.0.0/16;       # 内网 C 类
    set_real_ip_from 10.212.0.0/16;       # VPN 网段
    real_ip_header    X-Forwarded-For;    # 从 X-Forwarded-For 取最后一个非信任 IP
    real_ip_recursive on;                 # 递归剥离已信任代理 IP
-
    # ------------------------------------------------------------------
    # 基础配置
    # ------------------------------------------------------------------
@@ -50,8 +39,7 @@ http {
    tcp_nodelay       on;
    keepalive_timeout 65;
    types_hash_max_size 2048;
-    client_max_body_size 50m;   # 支持文件上传（企微媒体文件）
-
+    client_max_body_size 50m;
    # ------------------------------------------------------------------
    # Gzip 压缩（前端静态资源）
    # ------------------------------------------------------------------
@@ -59,39 +47,47 @@ http {
    gzip_vary      on;
    gzip_min_length 1024;
    gzip_types      text/plain text/css text/xml text/javascript
-                   application/javascript application/xml+rss
-                   application/json application/ld+json;
-
+                    application/javascript application/xml+rss
+                    application/json application/ld+json;
    # =================================================================
    # 上游服务定义（Docker 内部网络）
    # =================================================================
    upstream backend_api {
        server backend:8000;
    }
-
    # =================================================================
    # HTTP 服务（监听 80 端口）
    # =================================================================
-    # 如果公司有统一 SSL 终端（如 F5/Nginx 反代），此服务器只需监听 80
-    # 如果需要本机 HTTPS，取消下方 server 块注释，并配置证书路径
-    # =================================================================
-    # HTTP — 80 端口强制 301 跳 HTTPS
-    # =================================================================
    server {
        listen 80;
        server_name itsupport.servyou.com.cn;
-
-        # ACME http-01 验证用（如果以后用 Let's Encrypt）
        location /.well-known/acme-challenge/ {
            root /usr/share/nginx/html;
        }
-
-        # 其他全部 301 跳 https
+        # H5 静态文件服务
+        location /h5/ {
+            root /usr/share/nginx/html;
+            index index.html;
+            try_files $uri /h5/index.html;
+        }
+        # H5 API 反向代理
+        location /h5/api/ {
+            proxy_pass http://backend:8000/;
+            proxy_http_version 1.1;
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Connection "";
+            proxy_connect_timeout 60s;
+            proxy_send_timeout    300s;
+            proxy_read_timeout    300s;
+        }
        location / {
            return 301 https://$host$request_uri;
        }
    }
-
    # =================================================================
    # HTTPS — 443 端口(主服务)
    # =================================================================
@@ -99,8 +95,6 @@ http {
        listen 443 ssl;
        http2 on;
        server_name itsupport.servyou.com.cn;
-
-        # SSL 证书(通配符 *.servyou.com.cn,fullchain 含 leaf+intermediate+root)
        ssl_certificate     /etc/nginx/ssl/itsupport.servyou.com.cn.crt;
        ssl_certificate_key /etc/nginx/ssl/itsupport.servyou.com.cn.key;
        ssl_protocols       TLSv1.2 TLSv1.3;
@@ -108,92 +102,57 @@ http {
        ssl_prefer_server_ciphers on;
        ssl_session_cache   shared:SSL:10m;
        ssl_session_timeout 1d;
-
-        # ------------------------------------------------------------------
-        # 安全头
-        # ------------------------------------------------------------------
        add_header X-Content-Type-Options "nosniff" always;
        add_header X-Frame-Options "SAMEORIGIN" always;
        add_header X-XSS-Protection "1; mode=block" always;
        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
        add_header Referrer-Policy "strict-origin-when-cross-origin" always;
-
-        # CSP 收紧: 去掉 unsafe-inline(生产不需要,只有 dev HMR 需要)
-        add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-eval' https://res.wx.qq.com; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob: https: http:; connect-src 'self' https://qyapi.weixin.qq.com wss://*; font-src 'self' data:;" always;
-
-        # 隐私与跨域控制
+        add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-eval' https://res.wx.qq.com; style-src 'self' 'unsafe-inline' https://res.wx.qq.com; connect-src 'self' wss://itsupport.servyou.com.cn https://itsupport.servyou.com.cn https://qyapi.weixin.qq.com; img-src 'self' data: https://res.wx.qq.com; font-src 'self' data:;" always;
        add_header Permissions-Policy "camera=(), microphone=(), geolocation=(), payment=()" always;
        add_header Cross-Origin-Opener-Policy "same-origin" always;
        add_header Cross-Origin-Embedder-Policy "require-corp" always;
        add_header Cross-Origin-Resource-Policy "same-origin" always;
-
-        # 隐藏服务器版本
        server_tokens off;
-
-        # ------------------------------------------------------------------
-        # 健康检查端点
-        # ------------------------------------------------------------------
        location = /health {
            access_log off;
            return 200 "healthy\n";
            add_header Content-Type text/plain;
        }
-
-        # ------------------------------------------------------------------
-        # H5 员工端 — /itdesk/
-        # ------------------------------------------------------------------
+        # 员工端：/itdesk/ -> 重定向到 /itagent/（保持前端路由 base 一致）
        location /itdesk/ {
-            alias /usr/share/nginx/html/itdesk/;
-            index index.html;
-            try_files $uri /itdesk/index.html;
+            return 301 /itagent/;
        }
-
-        # ------------------------------------------------------------------
-        # 坐席工作台 — /itagent/
-        # ------------------------------------------------------------------
        location /itagent/ {
            alias /usr/share/nginx/html/itagent/;
            index index.html;
-            try_files $uri /itagent/index.html;
+            try_files $uri $uri/ /index.html;
        }
-
-        # ------------------------------------------------------------------
-        # 管理后台 — /itadmin/（仅限内网/VPN 访问）
-        # ------------------------------------------------------------------
        location /itadmin/ {
-            # IP 白名单：仅允许内网网段
            allow 10.0.0.0/8;
            allow 172.16.0.0/12;
            allow 192.168.0.0/16;
-            allow 10.212.0.0/16;  # VPN 网段
-            deny all;
-
+            allow 10.212.0.0/16;
+            allow 10.240.0.0/16;
+            allow 117.147.35.138;
+            allow 218.75.34.87;
+            allow 43.174.152.34;
+            #deny all;
            alias /usr/share/nginx/html/itadmin/;
            index index.html;
            try_files $uri /itadmin/index.html;
        }
-
-        # ------------------------------------------------------------------
-        # 统一入口 Portal — /itportal/
-        # ------------------------------------------------------------------
        location /itportal/ {
            alias /usr/share/nginx/html/itportal/;
            index index.html;
            try_files $uri /itportal/index.html;
        }
-
-        # ------------------------------------------------------------------
-        # 后端 API — /api/（管理端 API 仅限内网/VPN）
-        # ------------------------------------------------------------------
        location /api/ {
-            # 管理端 API 路径需要 IP 白名单
            location ~ ^/api/admin/ {
                allow 10.0.0.0/8;
                allow 172.16.0.0/12;
                allow 192.168.0.0/16;
                allow 10.212.0.0/16;
-                deny all;
-
+                #deny all;
                proxy_pass http://backend_api;
                proxy_set_header Host $host;
                proxy_set_header X-Real-IP $remote_addr;
@@ -203,28 +162,20 @@ http {
                proxy_send_timeout    300s;
                proxy_read_timeout    300s;
            }
-
-            # 其他 API 路径
            proxy_pass http://backend_api/;
            proxy_http_version 1.1;
-            proxy_redirect off;  # 禁用重定向修改，让后端的 307/302 保持原始 location
+            proxy_redirect off;
            proxy_set_header Host $host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_set_header X-Forwarded-Proto $scheme;
            proxy_set_header Connection "";
-
-            # 超时设置（AI 回复可能较慢）
            proxy_connect_timeout 60s;
            proxy_send_timeout    300s;
            proxy_read_timeout    300s;
        }
-
-        # ------------------------------------------------------------------
-        # WebSocket — /ws/（坐席端实时通信）
-        # ------------------------------------------------------------------
        location /ws/ {
-            access_log off;  # P0-#4: 关闭 WS 路径日志，避免 token 泄露
+            access_log off;
            proxy_pass http://backend_api;
            proxy_http_version 1.1;
            proxy_set_header Upgrade $http_upgrade;
@@ -232,18 +183,28 @@ http {
            proxy_set_header Host $host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_read_timeout 86400s;  # WebSocket 长连接
+            proxy_read_timeout 86400s;
+        }
+        # H5 静态文件服务
+        location /h5/ {
+            root /usr/share/nginx/html;
+            index index.html;
+            try_files $uri /h5/index.html;
+        }
+        # H5 API 反向代理
+        location /h5/api/ {
+            proxy_pass http://backend:8000/;
+            proxy_http_version 1.1;
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Connection "";
+            proxy_connect_timeout 60s;
+            proxy_send_timeout    300s;
+            proxy_read_timeout    300s;
        }
-
-        # ------------------------------------------------------------------
-        # 企微回调 — /api/wecom/callback（接收企微消息推送）
-        # ------------------------------------------------------------------
-        # 企微验证回调 URL 时使用 GET，后续消息推送使用 POST
-        # 此路径已包含在 /api/ 的代理规则中，无需单独配置
-
-        # ------------------------------------------------------------------
-        # 默认路径 — 重定向到统一入口
-        # ------------------------------------------------------------------
        location = / {
            return 302 /itportal/;
        }
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+"""Update nginx.conf to add 10.240.0.0/16"""
+import re
+
+with open('/opt/wecom-it-desk/nginx/nginx.conf', 'r') as f:
+    content = f.read()
+
+# Add 10.240.0.0/16 after 10.212.0.0/16 in both locations
+content = content.replace(
+    'allow 10.212.0.0/16;  # VPN 网段\n',
+    'allow 10.212.0.0/16;  # VPN 网段\n            allow 10.240.0.0/16;      # 内网段 - 办公网(新增)\n'
+)
+content = content.replace(
+    'allow 10.212.0.0/16;\n',
+    'allow 10.212.0.0/16;\n            allow 10.240.0.0/16;      # 内网段 - 办公网(新增)\n'
+)
+
+with open('/opt/wecom-it-desk/nginx/nginx.conf', 'w') as f:
+    f.write(content)
+
+print('Done')
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+"""Upload nginx.conf to production server via JumpServer"""
+import base64
+import subprocess
+import sys
+import os
+
+# Read and encode the nginx.conf file
+nginx_conf_path = os.path.join(os.path.dirname(__file__), 'nginx.conf')
+with open(nginx_conf_path, 'rb') as f:
+    b64_data = base64.b64encode(f.read()).decode()
+
+print(f"Encoded {len(b64_data)} characters")
+
+# Create the remote Python script
+remote_script = 'python3 -c "'
+remote_script += f"import base64; data = '''{b64_data}'''; "
+remote_script += "with open('/opt/wecom-it-desk/nginx/nginx.conf', 'wb') as f: f.write(base64.b64decode(data)); print('OK')"
+remote_script += '"'
+
+# Execute via jms_ops
+result = subprocess.run([
+    'python', r'C:\Users\simon\.workbuddy\skills\jumpserver-ops\scripts\jms_ops.py',
+    'exec', '-c', remote_script
+], capture_output=True, text=True, encoding='utf-8', errors='replace', cwd=r'd:\资料\03-项目开发\wecom_it_smart_desk')
+
+print(result.stdout)
+print(result.stderr)