v2.6.0

2023-08-26 14:09:59 +08:00 · 2023-08-26 14:09:59 +08:00 · d804635904
parent 2b15f0ca89
commit d804635904
8 changed files with 37 additions and 62 deletions
--- a/README.md
+++ b/README.md
@ -53,9 +53,16 @@ sudo wget https://waf.uusec.com/waf-install && chmod +x waf-install && ./waf-ins
 > Docker版安装方式如下： 

 ```bash
-sudo curl https://waf.uusec.com/docker-compose.yml -o docker-compose.yml && docker compose up -d
+sudo rm -f ./waf.tgz && wget https://waf.uusec.com/waf.tgz && tar -zxf waf.tgz && sh ./waf/uuwaf.sh
 ```

+> 快速入门：
+> 1、登录后台，访问https://wafip:4443，wafip为安装南墙的服务器ip，用户名admin，密码wafadmin
+> 2、添加站点，进入站点管理菜单，点击添加站点按钮，按提示添加站点域名与网站服务器ip
+> 3、添加证书，进入证书管理菜单，点击添加证书按钮，上传第二步中域名的https证书和私钥文件
+> 4、将域名DNS的ip指向改为南墙服务器ip地址
+> 5、访问站点域名查看网站是否能够访问
+


 ## :gift_heart: 贡献 Rule
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@ -1,3 +1,19 @@
+## [2.6.0](https://github.com/Safe3/uuWAF/compare/v2.6.0...v2.5.1) (2023-08-26)
+
+
+### 新增功能
+
+* 南墙安全验证X-Waf-Token 支持js读取
+* 增强南墙语义检测引擎
+
+
+### Bug 修复
+
+* 修复南墙语义检测引擎在某些情况下core dump的问题
+
+  
+
+
 ## [2.5.1](https://github.com/Safe3/uuWAF/compare/v2.5.1...v2.4.1) (2023-07-04)


--- a/docs/docker-compose.yml
+++ b/docs/docker-compose.yml
@ -1,56 +0,0 @@
-networks:
-  wafnet:
-    name: wafnet
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      - gateway: 172.22.0.1
-        subnet: 172.22.0.0/24
-    driver_opts:
-      com.docker.network.bridge.name: wafnet
-
-services:
-  uuwaf:
-   image: uusec/nanqiang:v2.5.2
-   ulimits:
-     nproc: 65535
-     nofile:
-       soft: 102400
-       hard: 102400
-   container_name: uuwaf
-   networks:
-      wafnet:
-        ipv4_address: 172.22.0.3
-   ports:
-     - "80:80"
-     - "443:443"
-     - "4443:4443"
-   volumes:
-     - wafshared:/uuwaf
-   command: ["/run.sh"]
-   environment:
-     - TZ=Asia/Shanghai
-
-   links:
-   - wafdb
-   depends_on:
-      - wafdb
-
-  wafdb:
-   image: percona:8
-   container_name: wafdb
-   networks:
-      wafnet:
-        ipv4_address: 172.22.0.7
-   volumes:
-     - wafshared:/docker-entrypoint-initdb.d
-     - wafdata:/var/lib/mysql
-   environment:
-     - TZ=Asia/Shanghai
-     - INIT_ROCKSDB
-     - MYSQL_ROOT_PASSWORD=Safe3.WAF
-
-volumes:
-  wafshared:
-  wafdata:
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@ -41,6 +41,7 @@
 | 集群管理 |<svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="#c33" stroke="#c33" stroke-width="4" stroke-linejoin="round"/><path d="M29.6567 18.3432L18.343 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M18.3433 18.3432L29.657 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg> | <svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z" fill="#3c3" stroke="#3c3" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L22 30L34 18" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>|
 | CDN加速 |<svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z" fill="#3c3" stroke="#3c3" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L22 30L34 18" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg> | <svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z" fill="#3c3" stroke="#3c3" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L22 30L34 18" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>|
 | 技术支持 |<svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="#c33" stroke="#c33" stroke-width="4" stroke-linejoin="round"/><path d="M29.6567 18.3432L18.343 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M18.3433 18.3432L29.657 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg> | <svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z" fill="#3c3" stroke="#3c3" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L22 30L34 18" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>|
+| 定制开发 |<svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="#c33" stroke="#c33" stroke-width="4" stroke-linejoin="round"/><path d="M29.6567 18.3432L18.343 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M18.3433 18.3432L29.657 29.6569" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg> | <svg width="24" height="24" viewBox="0 0 48 48" fill="none"><path d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z" fill="#3c3" stroke="#3c3" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L22 30L34 18" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>|



--- a/docs/guide/install.md
+++ b/docs/guide/install.md
@ -24,12 +24,19 @@

 ```bash
 sudo yum install -y ca-certificates
-sudo wget https://waf.uusec.com/waf-install && chmod +x waf-install && ./waf-install && rm -f ./waf-install
+sudo rm -f ./waf-install && wget https://waf.uusec.com/waf-install && chmod +x waf-install && ./waf-install
 ```

-?> 安装成功后会显示 “ 恭喜您，安装成功！”
+?> 安装成功后会显示 “ 恭喜您，安装成功”

 Docker版安装方式如下： 
 ```bash
-sudo curl https://waf.uusec.com/docker-compose.yml -o docker-compose.yml && docker compose up -d
-```
+sudo rm -f ./waf.tgz && wget https://waf.uusec.com/waf.tgz && tar -zxf waf.tgz && sh ./waf/uuwaf.sh
+```
+
+?> 快速入门：
+1、登录后台，访问https://wafip:4443，wafip为安装南墙的服务器ip，用户名admin，密码wafadmin
+2、添加站点，进入站点管理菜单，点击添加站点按钮，按提示添加站点域名与网站服务器ip
+3、添加证书，进入证书管理菜单，点击添加证书按钮，上传第二步中域名的https证书和私钥文件
+4、将域名DNS的ip指向改为南墙服务器ip地址
+5、访问站点域名查看网站是否能够访问
--- a/docs/waf-install
+++ b/docs/waf-install
--- a/docs/waf.tgz
+++ b/docs/waf.tgz
--- a/docs/wafversion
+++ b/docs/wafversion
@ -1 +1 @@
-2.5.1
+2.6.0
 @ -1 +1 @@
 .5.1
 .6.0