feat: update SafeLine 8.10.1

apps/safeline/7.6.2/.env.sample

@@ -1,5 +0,0 @@
-CONTAINER_NAME="safeline"
-PANEL_APP_PORT_HTTP="40080"
-POSTGRES_PASSWORD="password_xxJdZD"
-SAFELINE_DIR="./data"
-SUBNET_PREFIX="172.18.0"

apps/safeline/7.6.2/data.yml

@@ -1,32 +0,0 @@
-additionalProperties:
-  formFields:
-    - default: ""
-      edit: true
-      envKey: POSTGRES_PASSWORD
-      labelEn: Postgres database User Password
-      labelZh: Postgres数据库密码
-      required: true
-      rule: paramCommon
-      type: password
-    - default: 40080
-      edit: true
-      envKey: PANEL_APP_PORT_HTTP
-      labelEn: Port
-      labelZh: 端口
-      required: true
-      rule: paramPort
-      type: number
-    - default: ./data
-      edit: true
-      envKey: SAFELINE_DIR
-      labelEn: Data storage folder
-      labelZh: 数据存放文件夹
-      required: true
-      type: text
-    - default: 172.18.0
-      edit: true
-      envKey: SUBNET_PREFIX
-      labelEn: 1panel-network subnet prefix (Check the docker network to get it)
-      labelZh: 1panel-network 子网前缀 (查看docker网络获取)
-      required: true
-      type: text

apps/safeline/7.6.2/docker-compose.yml

@@ -1,167 +0,0 @@
-services:
-  safeline-mgt:
-    container_name: ${CONTAINER_NAME}-mgt
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.4
-    image: chaitin/safeline-mgt:7.6.2
-    volumes:
-    - /etc/localtime:/etc/localtime:ro
-    - ${SAFELINE_DIR}/resources/mgt:/app/data
-    - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z
-    - ${SAFELINE_DIR}/resources/sock:/app/sock
-    - /var/run:/app/run
-    ports:
-    - ${PANEL_APP_PORT_HTTP:-9443}:1443
-    healthcheck:
-      test: curl -k -f https://localhost:1443/api/open/health
-    environment:
-    - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
-    logging:
-      options:
-        max-size: "100m"
-        max-file: "5"
-    depends_on:
-      - safeline-pg
-      - safeline-fvm
-    labels:
-      createdBy: Apps
-
-  safeline-detector:
-    container_name: ${CONTAINER_NAME}-detector
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.5
-    image: chaitin/safeline-detector:7.6.2
-    volumes:
-    - ${SAFELINE_DIR}/resources/detector:/resources/detector
-    - ${SAFELINE_DIR}/logs/detector:/logs/detector
-    - /etc/localtime:/etc/localtime:ro
-    environment:
-    - LOG_DIR=/logs/detector
-    labels:
-      createdBy: Apps
-
-  safeline-tengine:
-    container_name: ${CONTAINER_NAME}-tengine
-    restart: always
-    image: chaitin/safeline-tengine:7.6.2
-    volumes:
-    - /etc/localtime:/etc/localtime:ro
-    - /etc/resolv.conf:/etc/resolv.conf:ro
-    - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
-    - ${SAFELINE_DIR}/resources/detector:/resources/detector
-    - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
-    - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx:z
-    - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
-    - ${SAFELINE_DIR}/resources/sock:/app/sock
-    environment:
-    - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server
-    - TCD_SNSERVER=${SUBNET_PREFIX}.5:8000
-    - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000
-    - CHAOS_ADDR=${SUBNET_PREFIX}.10
-    ulimits:
-      nofile: 131072
-    network_mode: host
-    labels:
-      createdBy: Apps
-
-  safeline-luigi:
-    container_name: ${CONTAINER_NAME}-luigi
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.7
-    image: chaitin/safeline-luigi:7.6.2
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${SAFELINE_DIR}/resources/luigi:/app/data
-      - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z
-    environment:
-      - MGT_IP=${SUBNET_PREFIX}.4
-      - LUIGI_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
-    logging:
-      options:
-        max-size: "100m"
-        max-file: "5"
-    depends_on:
-      - safeline-detector
-      - safeline-mgt
-    labels:
-      createdBy: Apps
-
-  safeline-fvm:
-    container_name: ${CONTAINER_NAME}-fvm
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.8
-    image: chaitin/safeline-fvm:7.6.2
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-    logging:
-      options:
-        max-size: "100m"
-        max-file: "5"
-    labels:
-      createdBy: Apps
-
-  safeline-pg:
-    container_name: ${CONTAINER_NAME}-pg
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.2
-    image: safeline-postgres:15.2
-    volumes:
-    - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data
-    - /etc/localtime:/etc/localtime:ro
-    environment:
-    - POSTGRES_USER=safeline-ce
-    - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    command: [postgres, -c, max_connections=600]
-    healthcheck:
-      test: pg_isready -U safeline-ce -d safeline-ce
-    labels:
-      createdBy: Apps
-
-  safeline-chaos:
-    container_name: ${CONTAINER_NAME}-chaos
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.10
-    image: chaitin/safeline-chaos:7.6.2
-    logging:
-      options:
-        max-size: "100m"
-        max-file: "5"
-    volumes:
-      - ${SAFELINE_DIR}/resources/sock:/app/sock
-      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
-    environment:
-      - DB_ADDR=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
-    labels:
-      createdBy: Apps
-
-networks:
-  1panel-network:
-    external: true
-  safeline-ce:
-    name: safeline-ce
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      - gateway: ${SUBNET_PREFIX:?SUBNET_PREFIX required}.1
-        subnet: ${SUBNET_PREFIX}.0/24
-    driver_opts:
-      com.docker.network.bridge.name: safeline-ce

apps/safeline/8.10.1/docker-compose.yml

@@ -4,9 +4,8 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.234
-        ipv4_address: ${SUBNET_PREFIX}.4
+    image: chaitin/safeline-mgt:8.10.1
-    image: chaitin/safeline-mgt:7.3.1
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - ${SAFELINE_DIR}/resources/mgt:/app/data
@@ -34,9 +33,8 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.235
-        ipv4_address: ${SUBNET_PREFIX}.5
+    image: chaitin/safeline-detector:8.10.1
-    image: chaitin/safeline-detector:7.3.1
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -49,7 +47,7 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:7.3.1
+    image: chaitin/safeline-tengine:8.10.1
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - /etc/resolv.conf:/etc/resolv.conf:ro
@@ -60,8 +58,8 @@ services:
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     - ${SAFELINE_DIR}/resources/sock:/app/sock
     environment:
-    - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server
+    - TCD_MGT_API=https://${SUBNET_PREFIX}.234:1443/api/open/publish/server
-    - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000
+    - SNSERVER_ADDR=${SUBNET_PREFIX}.235:8000
     ulimits:
       nofile: 131072
     network_mode: host
@@ -73,15 +71,13 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.237
-        ipv4_address: ${SUBNET_PREFIX}.7
+    image: chaitin/safeline-luigi:8.10.1
-    image: chaitin/safeline-luigi:7.3.1
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
-      - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z
     environment:
-      - MGT_IP=${SUBNET_PREFIX}.4
+      - MGT_IP=${SUBNET_PREFIX}.234
     logging:
       options:
         max-size: "100m"
@@ -97,9 +93,8 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.238
-        ipv4_address: ${SUBNET_PREFIX}.8
+    image: chaitin/safeline-fvm:8.10.1
-    image: chaitin/safeline-fvm:7.3.1
     volumes:
       - /etc/localtime:/etc/localtime:ro
     logging:
@@ -114,9 +109,8 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.232
-        ipv4_address: ${SUBNET_PREFIX}.2
+    image: chaitin/safeline-postgres:15.2
-    image: postgres:15.8
     volumes:
     - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data
     - /etc/localtime:/etc/localtime:ro
@@ -134,9 +128,8 @@ services:
     restart: always
     networks:
       1panel-network:
-      safeline-ce:
+        ipv4_address: ${SUBNET_PREFIX}.240
-        ipv4_address: ${SUBNET_PREFIX}.10
+    image: chaitin/safeline-chaos:8.10.1
-    image: chaitin/safeline-chaos:7.3.1
     logging:
       options:
         max-size: "100m"
@@ -150,13 +143,3 @@ services:
 networks:
   1panel-network:
     external: true
-  safeline-ce:
-    name: safeline-ce
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      - gateway: ${SUBNET_PREFIX:?SUBNET_PREFIX required}.1
-        subnet: ${SUBNET_PREFIX}.0/24
-    driver_opts:
-      com.docker.network.bridge.name: safeline-ce

apps/safeline/README.md

@@ -1,23 +1,13 @@
-<p align="center">
+# SafeLine - 雷池 - 不让黑客越过半步
-  <img src="https://github.com/chaitin/SafeLine/blob/main/images/banner.png?raw=true" width="400" />
-</p>
 
-
-<h4 align="center">
-  SafeLine - 雷池 - 不让黑客越过半步
-</h4>
-
-<p align="center">
-  <a target="_blank" href="https://waf-ce.chaitin.cn/">🏠 官网</a> &nbsp; | &nbsp;
-  <a target="_blank" href="https://docs.waf-ce.chaitin.cn/">📖 文档</a> &nbsp; | &nbsp;
-  <a target="_blank" href="https://demo.waf-ce.chaitin.cn:9443/">🔍 演示环境</a> &nbsp; | &nbsp;
-  <a target="_blank" href="/images/wechat.png">🙋‍♂️ 社区微信群</a> &nbsp; | &nbsp;
-  <a target="_blank" href="https://github.com/chaitin/SafeLine">国际版</a>
-</p>
 ## 👋 项目介绍
 
 SafeLine，中文名 "雷池"，是一款简单好用, 效果突出的 **`Web 应用防火墙(WAF)`**，可以保护 Web 服务不受黑客攻击。
 
+![](https://cdn.jsdelivr.net/gh/xiaoY233/PicList@main/public/assets/SafeLine.png)
+
+![](https://img.shields.io/badge/Copyright-arch3rPro-ff9800?style=flat&logo=github&logoColor=white)
+
 雷池通过过滤和监控 Web 应用与互联网之间的 HTTP 流量来保护 Web 服务。可以保护 Web 服务免受 `SQL 注入`、`XSS`、 `代码注入`、`命令注入`、`CRLF 注入`、`ldap 注入`、`xpath 注入`、`RCE`、`XXE`、`SSRF`、`路径遍历`、`后门`、`暴力破解`、`CC`、`爬虫` 等攻击。
 
 #### 💡 工作原理

apps/safeline/data.yml

@@ -13,7 +13,7 @@ additionalProperties:
   description:
     zh: 一款足够简单、足够好用、足够强的免费 WAF
     en: A simple and easy to use WAF tool
-  type: tool
+  type: website
   crossVersionUpdate: true
   limit: 1
   recommend: 0