From 0766ec9d5a32c5f63c9f0356537ea712a06334e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Fri, 26 Feb 2021 16:32:07 +0800
Subject: [PATCH] =?UTF-8?q?WAF=E5=8A=A8=E4=BD=9C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAHTML=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/firewall-actions/createPopup.go  | 10 ++++++++++
 .../settings/firewall-actions/updatePopup.go  | 10 ++++++++++
 .../firewall-actions/createPopup.html         | 19 +++++++++++++++++++
 .../firewall-actions/updatePopup.html         | 10 ++++++++++
 4 files changed, 49 insertions(+)

diff --git a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go
index 6d413443..b189e449 100644
--- a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go
@@ -43,6 +43,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 	// http api
 	HttpAPIURL string
 
+	// html
+	HtmlContent string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -90,6 +93,13 @@ func (this *CreatePopupAction) RunPost(params struct {
 		actionParams = &firewallconfigs.FirewallActionHTTPAPIConfig{
 			URL: params.HttpAPIURL,
 		}
+	case firewallconfigs.FirewallActionTypeHTML:
+		params.Must.
+			Field("htmlContent", params.HtmlContent).
+			Require("请输入HTML内容")
+		actionParams = &firewallconfigs.FirewallActionHTMLConfig{
+			Content: params.HtmlContent,
+		}
 	default:
 		this.Fail("选择的类型'" + params.Type + "'暂时不支持")
 	}
diff --git a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go
index 186b46c1..bd999832 100644
--- a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go
@@ -72,6 +72,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	// http api
 	HttpAPIURL string
 
+	// HTML内容
+	HtmlContent string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -119,6 +122,13 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		actionParams = &firewallconfigs.FirewallActionHTTPAPIConfig{
 			URL: params.HttpAPIURL,
 		}
+	case firewallconfigs.FirewallActionTypeHTML:
+		params.Must.
+			Field("htmlContent", params.HtmlContent).
+			Require("请输入HTML内容")
+		actionParams = &firewallconfigs.FirewallActionHTMLConfig{
+			Content: params.HtmlContent,
+		}
 	default:
 		this.Fail("选择的类型'" + params.Type + "'暂时不支持")
 	}
diff --git a/web/views/@default/clusters/cluster/settings/firewall-actions/createPopup.html b/web/views/@default/clusters/cluster/settings/firewall-actions/createPopup.html
index cbcbd732..c177f4d2 100644
--- a/web/views/@default/clusters/cluster/settings/firewall-actions/createPopup.html
+++ b/web/views/@default/clusters/cluster/settings/firewall-actions/createPopup.html
@@ -92,6 +92,25 @@
                 </td>
             </tr>
         </tbody>
+
+        <!-- HTML -->
+        <tbody v-if="type == 'html'">
+            <tr>
+                <td>HTML内容 *</td>
+                <td>
+                    <textarea name="htmlContent" maxlength="128000" placeholder="完整的HTML内容">&lt;!DOCTYPE html&gt;
+&lt;html lang=&#34;zh&#34;&gt;
+&lt;head&gt;
+&lt;title&gt;&lt;/title&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;!-- 这里写提示文字 --&gt;
+
+&lt;/body&gt;
+&lt;/html&gt;</textarea>
+                </td>
+            </tr>
+        </tbody>
     </table>
     <submit-btn></submit-btn>
 </form>
\ No newline at end of file
diff --git a/web/views/@default/clusters/cluster/settings/firewall-actions/updatePopup.html b/web/views/@default/clusters/cluster/settings/firewall-actions/updatePopup.html
index 9a866749..ab91137a 100644
--- a/web/views/@default/clusters/cluster/settings/firewall-actions/updatePopup.html
+++ b/web/views/@default/clusters/cluster/settings/firewall-actions/updatePopup.html
@@ -92,6 +92,16 @@
                 </td>
             </tr>
         </tbody>
+
+        <!-- HTML -->
+        <tbody v-if="type == 'html'">
+            <tr>
+                <td>HTML内容 *</td>
+                <td>
+                        <textarea name="htmlContent" maxlength="128000" placeholder="完整的HTML内容" v-model="action.params.content"></textarea>
+                </td>
+            </tr>
+        </tbody>
     </table>
     <submit-btn></submit-btn>
 </form>
\ No newline at end of file