From 67aaa3b2bd283c7f6f2c306dac8da3bf2ac44b73 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Tue, 20 Dec 2022 16:47:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20nginx=20waf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/nginx/versions/1.21.4/conf/nginx.conf    |  2 +-
 .../waf/rules/{ipBlocklist => ipBlockList}    |  0
 .../waf/rules/{ipWhitelist => ipWhiteList}    |  0
 frontend/src/lang/modules/zh.ts               | 11 +++++++
 .../website/config/safety/ccdeny/index.vue    |  2 +-
 .../website/website/config/safety/index.vue   | 32 +++++++++----------
 .../website/config/safety/ip-list/index.vue   |  4 +--
 7 files changed, 31 insertions(+), 20 deletions(-)
 rename apps/nginx/versions/1.21.4/www/common/waf/rules/{ipBlocklist => ipBlockList} (100%)
 rename apps/nginx/versions/1.21.4/www/common/waf/rules/{ipWhitelist => ipWhiteList} (100%)

diff --git a/apps/nginx/versions/1.21.4/conf/nginx.conf b/apps/nginx/versions/1.21.4/conf/nginx.conf
index b9c3624b3..0fb7ee978 100644
--- a/apps/nginx/versions/1.21.4/conf/nginx.conf
+++ b/apps/nginx/versions/1.21.4/conf/nginx.conf
@@ -1,4 +1,4 @@
-#user  nginx;
+user  root;
 worker_processes  auto;
 
 error_log  /var/log/nginx/error.log notice;
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlocklist b/apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlockList
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlocklist
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlockList
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhitelist b/apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhiteList
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhitelist
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhiteList
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 3960f2634..b25de61cb 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -905,4 +905,15 @@ export default {
         manualCreate: '手动创建',
         acmeAccount: 'Acme 账号',
     },
+    firewall: {
+        ccDeny: 'CC 防护',
+        ipWhiteList: 'IP 白名单',
+        ipBlockList: 'IP 黑名单',
+        fileExtBlockList: '文件扩展名黑名单',
+        urlWhiteList: 'URL 白名单',
+        urlBlockList: 'URL 黑名单',
+        argsCheck: 'GET 参数校验',
+        postCheck: 'POST 参数校验',
+        cookieBlockList: 'Cookie 黑名单',
+    },
 };
diff --git a/frontend/src/views/website/website/config/safety/ccdeny/index.vue b/frontend/src/views/website/website/config/safety/ccdeny/index.vue
index 26a808ced..78d458214 100644
--- a/frontend/src/views/website/website/config/safety/ccdeny/index.vue
+++ b/frontend/src/views/website/website/config/safety/ccdeny/index.vue
@@ -67,7 +67,7 @@ let form = reactive({
 let req = ref<Website.WafReq>({
     websiteId: 0,
     key: '$CCDeny',
-    rule: 'ccrate',
+    rule: 'ccRate',
 });
 let enableUpdate = ref<Website.WafUpdate>({
     websiteId: 0,
diff --git a/frontend/src/views/website/website/config/safety/index.vue b/frontend/src/views/website/website/config/safety/index.vue
index 31dc8234f..1fed9a510 100644
--- a/frontend/src/views/website/website/config/safety/index.vue
+++ b/frontend/src/views/website/website/config/safety/index.vue
@@ -1,18 +1,15 @@
 <template>
     <el-tabs tab-position="left" type="border-card" v-model="index">
-        <el-tab-pane :label="'CC 防护'" name="cc">
+        <el-tab-pane :label="$t('firewall.ccDeny')" name="cc">
             <CCDeny :id="id" v-if="index == 'cc'"></CCDeny>
         </el-tab-pane>
-        <el-tab-pane :label="'IP 白名单'" name="ipWhiteList">
-            <IpList :id="id" :rule="'ipWhitelist'" :param-key="'$ipWhiteAllow'" v-if="index == 'ipWhiteList'"></IpList>
+        <el-tab-pane :label="$t('firewall.ipWhiteList')" name="ipWhiteList">
+            <IpList :id="id" :rule="'ipWhiteList'" :param-key="'$ipWhiteAllow'" v-if="index == 'ipWhiteList'"></IpList>
         </el-tab-pane>
-        <el-tab-pane :label="'IP 黑名单'" name="ipBlockList">
+        <el-tab-pane :label="$t('firewall.ipBlockList')" name="ipBlockList">
             <IpList :id="id" :rule="'ipBlockList'" :param-key="'$ipBlockDeny'" v-if="index == 'ipBlockList'"></IpList>
         </el-tab-pane>
-        <el-tab-pane :label="'文件扩展名黑名单'" name="fileExtBlockList">
-            <FileBlockList :id="id" v-if="index == 'fileExtBlockList'"></FileBlockList>
-        </el-tab-pane>
-        <el-tab-pane :label="'URL白名单'" name="urlWhiteList">
+        <el-tab-pane :label="$t('firewall.urlWhiteList')" name="urlWhiteList">
             <ValueList
                 :id="id"
                 :rule="'urlWhiteList'"
@@ -20,7 +17,7 @@
                 v-if="index == 'urlWhiteList'"
             ></ValueList>
         </el-tab-pane>
-        <el-tab-pane :label="'URL黑名单'" name="urlBlockList">
+        <el-tab-pane :label="$t('firewall.urlBlockList')" name="urlBlockList">
             <ValueList
                 :id="id"
                 :rule="'urlBlockList'"
@@ -28,13 +25,7 @@
                 v-if="index == 'urlBlockList'"
             ></ValueList>
         </el-tab-pane>
-        <el-tab-pane :label="'GET参数(args)校验'" name="args">
-            <ValueList :id="id" :rule="'argsCheckList'" :param-key="'$argsDeny'" v-if="index == 'args'"></ValueList>
-        </el-tab-pane>
-        <el-tab-pane :label="'POST参数校验'" name="post">
-            <ValueList :id="id" :rule="'postCheckList'" :param-key="'$postDeny'" v-if="index == 'post'"></ValueList>
-        </el-tab-pane>
-        <el-tab-pane :label="'Cookie黑名单'" name="cookie">
+        <el-tab-pane :label="$t('firewall.cookieBlockList')" name="cookie">
             <ValueList
                 :id="id"
                 :rule="'cookieBlockList'"
@@ -42,6 +33,15 @@
                 v-if="index == 'cookie'"
             ></ValueList>
         </el-tab-pane>
+        <el-tab-pane :label="$t('firewall.argsCheck')" name="args">
+            <ValueList :id="id" :rule="'argsCheckList'" :param-key="'$argsDeny'" v-if="index == 'args'"></ValueList>
+        </el-tab-pane>
+        <el-tab-pane :label="$t('firewall.postCheck')" name="post">
+            <ValueList :id="id" :rule="'postCheckList'" :param-key="'$postDeny'" v-if="index == 'post'"></ValueList>
+        </el-tab-pane>
+        <el-tab-pane :label="$t('firewall.fileExtBlockList')" name="fileExtBlockList">
+            <FileBlockList :id="id" v-if="index == 'fileExtBlockList'"></FileBlockList>
+        </el-tab-pane>
     </el-tabs>
 </template>
 <script lang="ts" setup>
diff --git a/frontend/src/views/website/website/config/safety/ip-list/index.vue b/frontend/src/views/website/website/config/safety/ip-list/index.vue
index a488a4b7b..2fe83a1c3 100644
--- a/frontend/src/views/website/website/config/safety/ip-list/index.vue
+++ b/frontend/src/views/website/website/config/safety/ip-list/index.vue
@@ -53,7 +53,7 @@ const props = defineProps({
     },
     rule: {
         type: String,
-        default: 'ipWhitelist',
+        default: 'ipWhiteList',
     },
     paramKey: {
         type: String,
@@ -75,7 +75,7 @@ let data = ref([]);
 let req = ref<Website.WafReq>({
     websiteId: 0,
     key: '$ipWhiteAllow',
-    rule: 'ipWhitelist',
+    rule: 'ipWhiteList',
 });
 let fileUpdate = reactive({
     path: '',