优化自定义页面设置，页面URL不再支持填写本地文件

internal/web/actions/default/servers/server/settings/pages/createPopup.go

@@ -45,7 +45,8 @@ func (this *CreatePopupAction) RunPost(params struct {
 	case shared.BodyTypeURL:
 		params.Must.
 			Field("url", params.URL).
-			Require("请输入要显示的URL")
+			Require("请输入要显示的URL").
+			Match(	`^(?i)(http|https)://`, "请输入正确的URL")
 	case shared.BodyTypeHTML:
 		params.Must.
 			Field("body", params.Body).

internal/web/actions/default/servers/server/settings/pages/index.go

@@ -1,11 +1,16 @@
 package pages
 
-import (	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/types"
+	"regexp"
 )
 
 type IndexAction struct {
@@ -46,18 +51,75 @@ func (this *IndexAction) RunGet(params struct {
 
 func (this *IndexAction) RunPost(params struct {
 	WebId        int64
-	PagesJSON    string
+	PagesJSON    []byte
-	ShutdownJSON string
+	ShutdownJSON []byte
 	Must         *actions.Must
 }) {
 	// 日志
 	defer this.CreateLogInfo(codes.ServerPage_LogUpdatePages, params.WebId)
 
-	// TODO 检查配置
+	// 检查配置
+	var urlReg = regexp.MustCompile(`^(?i)(http|https)://`)
+
+	// validate pages
+	if len(params.PagesJSON) > 0 {
+		var pages = []*serverconfigs.HTTPPageConfig{}
+		err := json.Unmarshal(params.PagesJSON, &pages)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, page := range pages {
+			err = page.Init()
+			if err != nil {
+				this.Fail("配置校验失败：" + err.Error())
+				return
+			}
+
+			// check url
+			if page.BodyType == shared.BodyTypeURL && !urlReg.MatchString(page.URL) {
+				this.Fail("自定义页面中 '" + page.URL + "' 不是一个正确的URL，请进行修改")
+				return
+			}
+		}
+	}
+
+	// validate shutdown page
+	if len(params.ShutdownJSON) > 0 {
+		var shutdownConfig = &serverconfigs.HTTPShutdownConfig{}
+		err := json.Unmarshal(params.ShutdownJSON, shutdownConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		err = shutdownConfig.Init()
+		if err != nil {
+			this.Fail("配置校验失败：" + err.Error())
+			return
+		}
+
+		if shutdownConfig.BodyType == shared.BodyTypeURL {
+			if len(shutdownConfig.URL) > 512 {
+				this.Fail("临时关闭页面中URL过长，不能超过512字节")
+				return
+			}
+
+			if !urlReg.MatchString(shutdownConfig.URL) {
+				this.Fail("临时关闭页面中 '" + shutdownConfig.URL + "' 不是一个正确的URL，请进行修改")
+				return
+			}
+		} else if shutdownConfig.Body == shared.BodyTypeHTML {
+			if len(shutdownConfig.Body) > 32*1024 {
+				this.Fail("临时关闭页面中HTML内容长度不能超过32K")
+				return
+			}
+		}
+	}
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
 		HttpWebId: params.WebId,
-		PagesJSON: []byte(params.PagesJSON),
+		PagesJSON: params.PagesJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -66,7 +128,7 @@ func (this *IndexAction) RunPost(params struct {
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{
 		HttpWebId:    params.WebId,
-		ShutdownJSON: []byte(params.ShutdownJSON),
+		ShutdownJSON: params.ShutdownJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/pages/updatePopup.go

@@ -65,7 +65,8 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	case shared.BodyTypeURL:
 		params.Must.
 			Field("url", params.URL).
-			Require("请输入要显示的URL")
+			Require("请输入要显示的URL").
+			Match(	`^(?i)(http|https)://`, "请输入正确的URL")
 	case shared.BodyTypeHTML:
 		params.Must.
 			Field("body", params.Body).

web/public/js/components/server/http-pages-and-shutdown-box.js

@@ -114,18 +114,19 @@ Vue.component("http-pages-and-shutdown-box", {
 					<prior-checkbox :v-config="shutdownConfig" v-if="vIsLocation"></prior-checkbox>
 					<tbody v-show="!vIsLocation || shutdownConfig.isPrior">
 						<tr>
-							<td class="title">开启</td>
+							<td class="title">临时关闭网站</td>
 							<td>
 								<div class="ui checkbox">
 									<input type="checkbox" value="1" v-model="shutdownConfig.isOn" />
 									<label></label>
 								</div>
+								<p class="comment">选中后，表示临时关闭当前网站，并显示自定义内容。</p>
 							</td>
 						</tr>
 					</tbody>
 					<tbody v-show="(!vIsLocation || shutdownConfig.isPrior) && shutdownConfig.isOn">
 						<tr>
-							<td>内容类型 *</td>
+							<td>显示内容类型 *</td>
 							<td>
 								<select class="ui dropdown auto-width" v-model="shutdownConfig.bodyType">
 									<option value="url">读取URL</option>
@@ -134,14 +135,14 @@ Vue.component("http-pages-and-shutdown-box", {
 							</td>
 						</tr>
 						<tr v-show="shutdownConfig.bodyType == 'url'">
-							<td class="title">页面URL *</td>
+							<td class="title">显示页面URL *</td>
 							<td>
-								<input type="text" v-model="shutdownConfig.url" placeholder="页面文件路径或一个完整URL"/>
+								<input type="text" v-model="shutdownConfig.url" placeholder="类似于 https://example.com/page.html"/>
-								<p class="comment">页面文件是相对于节点安装目录的页面文件比如pages/40x.html，或者一个完整的URL。</p>
+								<p class="comment">将从此URL中读取内容。</p>
 							</td>
 						</tr>
 						<tr v-show="shutdownConfig.bodyType == 'html'">
-							<td>HTML *</td>
+							<td>显示页面HTML *</td>
 							<td>
 								<textarea name="body" ref="shutdownHTMLBody" v-model="shutdownConfig.body"></textarea>
 								<p class="comment"><a href="" @click.prevent="addShutdownHTMLTemplate">[使用模板]</a>。填写页面的HTML内容，支持请求变量。</p>

web/views/@default/servers/server/settings/pages/createPopup.html

@@ -6,7 +6,7 @@
 			<td class="title">响应状态码 *</td>
 			<td>
 				<input type="text" name="status" size="3" placeholder="状态码" maxlength="3" style="width:5.2em" ref="focus"/>
-				<p class="comment">比如404，或者50x。</p>
+                <p class="comment">匹配的响应状态码，比如404，或者50x。</p>
 			</td>
 		</tr>
         <tr>
@@ -18,14 +18,14 @@
             </td>
         </tr>
 		<tr v-show="bodyType == 'url'">
-			<td>URL *</td>
+			<td>显示页面URL *</td>
 			<td>
-				<input type="text" name="url" maxlength="500" placeholder="页面文件路径或者完整的URL"/>
+				<input type="text" name="url" maxlength="500" placeholder="类似于 https://example.com/page.html"/>
-				<p class="comment">页面文件是相对于节点安装目录的页面文件比如web/pages/40x.html，或者一个完整的URL。</p>
+                <p class="comment">将从此URL中读取内容。</p>
 			</td>
 		</tr>
         <tr v-show="bodyType == 'html'">
-            <td>HTML *</td>
+            <td>显示页面HTML *</td>
             <td>
                 <textarea name="body" ref="htmlBody"></textarea>
                 <p class="comment"><a href="" @click.prevent="addHTMLTemplate">[使用模板]</a>。填写页面的HTML内容，支持请求变量。</p>

web/views/@default/servers/server/settings/pages/updatePopup.html

@@ -7,7 +7,7 @@
 			<td class="title">响应状态码 *</td>
 			<td>
 				<input type="text" name="status" size="3" placeholder="状态码" maxlength="3" style="width:5.2em" ref="focus" v-model="pageConfig.status"/>
-				<p class="comment">比如404，或者50x。</p>
+				<p class="comment">匹配的响应状态码，比如404，或者50x。</p>
 			</td>
 		</tr>
         <tr>
@@ -19,14 +19,14 @@
             </td>
         </tr>
 		<tr v-show="bodyType == 'url'">
-			<td>URL *</td>
+			<td>显示页面URL *</td>
 			<td>
-				<input type="text" name="url" maxlength="500" placeholder="页面文件路径或者完整的URL" v-model="pageConfig.url"/>
+				<input type="text" name="url" maxlength="500" placeholder="类似于 https://example.com/page.html" v-model="pageConfig.url"/>
-				<p class="comment">页面文件是相对于节点安装目录的页面文件比如web/pages/40x.html，或者一个完整的URL。</p>
+                <p class="comment">将从此URL中读取内容。</p>
 			</td>
 		</tr>
         <tr v-show="bodyType == 'html'">
-            <td>HTML *</td>
+            <td>显示页面HTML *</td>
             <td>
                 <textarea name="body" ref="htmlBody" v-model="pageConfig.body"></textarea>
                 <p class="comment"><a href="" @click.prevent="addHTMLTemplate">[使用模板]</a>。填写页面的HTML内容，支持请求变量。</p>