Update from GitHub Actions

.cnb.yml

@@ -8,3 +8,13 @@ master:
           script: echo $GITHUB_TOKEN_GK && echo $GITHUB_TOKEN && node -v && npm -v
         - name: 将master分支同步更新到github的main分支
           script: git push https://$GITHUB_TOKEN_GK:[email protected]/zhezzma/scraper-proxy.git HEAD:main
+        - name: 构建并打包
+          script: | 
+            mkdir archive
+            tar --exclude='./archive' --exclude='.git' -zcvf archive/release.tar.gz .
+        - name: ansible发布
+          image: plugins/ansible
+          settings:
+            private_key: $SERVER_PRIVATE_KEY
+            inventory: hosts
+            playbook: playbook.yml

hosts

@@ -0,0 +1,6 @@
+# hosts
+# 这里填写主机分组名
+[hostgroup]
+# 这里填写部署主机的ip
+159.138.99.139
+

main.py

@@ -342,6 +342,27 @@ async def proxy(request: Request):
     通用代理端点，转发所有请求到目标URL，支持流式响应
     """
     try:
+        # 获取环境变量中的token
+        env_token = os.environ.get('TOKEN')
+        if env_token:
+            # 从请求头获取Authorization
+            auth_header = request.headers.get('Authorization')
+            if not auth_header or not auth_header.startswith('Bearer '):
+                raise HTTPException(
+                    status_code=401,
+                    detail="未提供有效的Authorization header",
+                    headers={"WWW-Authenticate": "Bearer"}
+                )
+            
+            # 提取Bearer token
+            token = auth_header.split(' ')[1]
+            # 验证token
+            if token != env_token:
+                raise HTTPException(
+                    status_code=403,
+                    detail="Token无效"
+                )
+
         # 获取请求方法
         method = request.method
         
@@ -389,6 +410,7 @@ async def proxy(request: Request):
         headers = dict(request.headers)
         # 移除可能导致问题的头
         headers.pop("host", None)
+        headers.pop("authorization", None)
         headers.pop("cookie", None)
         headers.pop("x-forwarded-for", None)
         headers.pop("x-forwarded-proto", None)

playbook.yml

@@ -0,0 +1,41 @@
+- name: My first play
+  hosts: hostgroup
+  remote_user: root
+  tasks:
+    - name: 停止旧服务
+      shell: |
+        pid=$(ps -ef | grep "uvicorn main:app" | grep -v grep | awk '{print $2}')
+        if [ ! -z "$pid"; then
+          kill -9 $pid
+        fi
+      args:
+        executable: /bin/bash
+      ignore_errors: yes
+
+    - name: 复制到远程服务器
+      copy:
+        src: archive/release.tar.gz
+        dest: /root/deploy/scraper-proxy.tar.gz
+
+    - name: 解压文件
+      shell: |
+        rm -rf /root/workspace/scraper-proxy  
+        mkdir -p /root/workspace/scraper-proxy
+        tar -zxvf /root/deploy/scraper-proxy.tar.gz -C /root/workspace/scraper-proxy
+      args:
+        executable: /bin/bash
+
+    - name: 构建并运行
+      shell: |
+        cd /root/workspace/scraper-proxy
+        pip install --no-cache-dir -r requirements.txt
+        nohup uvicorn main:app --host 0.0.0.0 --port 7860 > ./nohup.log 2>&1 &
+      args:
+        executable: /bin/bash
+
+    - name: 等待服务启动
+      wait_for:
+        port: 7860
+        timeout: 30
+
+