静态分发增加例外URL、限制URL、排除隐藏文件等选项

internal/web/actions/default/servers/create.go

@@ -347,7 +347,7 @@ func (this *CreateAction) RunPost(params struct {
 		var rootJSON []byte
 		var err error
 		if len(params.WebRoot) > 0 {
-			var rootConfig = &serverconfigs.HTTPRootConfig{}
+			var rootConfig = serverconfigs.NewHTTPRootConfig()
 			rootConfig.IsOn = true
 			rootConfig.Dir = params.WebRoot
 			rootConfig.Indexes = []string{"index.html", "index.htm"}

web/public/js/components/server/http-web-root-box.js

@@ -1,23 +1,34 @@
 Vue.component("http-web-root-box", {
 	props: ["v-root-config", "v-is-location", "v-is-group"],
 	data: function () {
-		let rootConfig = this.vRootConfig
-		if (rootConfig == null) {
-			rootConfig = {
+		let config = this.vRootConfig
+		if (config == null) {
+			config = {
 				isPrior: false,
 				isOn: false,
 				dir: "",
 				indexes: [],
 				stripPrefix: "",
 				decodePath: false,
-				isBreak: false
+				isBreak: false,
+				exceptHiddenFiles: true,
+				onlyURLPatterns: [],
+				exceptURLPatterns: []
 			}
 		}
-		if (rootConfig.indexes == null) {
-			rootConfig.indexes = []
+		if (config.indexes == null) {
+			config.indexes = []
 		}
+
+		if (config.onlyURLPatterns == null) {
+			config.onlyURLPatterns = []
+		}
+		if (config.exceptURLPatterns == null) {
+			config.exceptURLPatterns = []
+		}
+
 		return {
-			rootConfig: rootConfig,
+			config: config,
 			advancedVisible: false
 		}
 	},
@@ -30,27 +41,27 @@ Vue.component("http-web-root-box", {
 			teaweb.popup("/servers/server/settings/web/createIndex", {
 				height: "10em",
 				callback: function (resp) {
-					that.rootConfig.indexes.push(resp.data.index)
+					that.config.indexes.push(resp.data.index)
 				}
 			})
 		},
 		removeIndex: function (i) {
-			this.rootConfig.indexes.$remove(i)
+			this.config.indexes.$remove(i)
 		},
 		isOn: function () {
-			return ((!this.vIsLocation && !this.vIsGroup) || this.rootConfig.isPrior) && this.rootConfig.isOn
+			return ((!this.vIsLocation && !this.vIsGroup) || this.config.isPrior) && this.config.isOn
 		}
 	},
 	template: `<div>
-	<input type="hidden" name="rootJSON" :value="JSON.stringify(rootConfig)"/>
+	<input type="hidden" name="rootJSON" :value="JSON.stringify(config)"/>
 	<table class="ui table selectable definition">
-		<prior-checkbox :v-config="rootConfig" v-if="vIsLocation || vIsGroup"></prior-checkbox>
-		<tbody v-show="(!vIsLocation && !vIsGroup) || rootConfig.isPrior">
+		<prior-checkbox :v-config="config" v-if="vIsLocation || vIsGroup"></prior-checkbox>
+		<tbody v-show="(!vIsLocation && !vIsGroup) || config.isPrior">
 			<tr>
 				<td class="title">启用静态资源分发</td>
 				<td>
 					<div class="ui checkbox">
-						<input type="checkbox" v-model="rootConfig.isOn"/>
+						<input type="checkbox" v-model="config.isOn"/>
 						<label></label>
 					</div>
 				</td>
@@ -60,7 +71,7 @@ Vue.component("http-web-root-box", {
 			<tr>
 				<td class="title">静态资源根目录</td>
 				<td>
-					<input type="text" name="root" v-model="rootConfig.dir" ref="focus" placeholder="类似于 /home/www"/>
+					<input type="text" name="root" v-model="config.dir" ref="focus" placeholder="类似于 /home/www"/>
 					<p class="comment">可以访问此根目录下的静态资源。</p>
 				</td>
 			</tr>
@@ -72,8 +83,8 @@ Vue.component("http-web-root-box", {
 				<td>首页文件</td>
 				<td>
 					<!-- TODO 支持排序 -->
-					<div v-if="rootConfig.indexes.length > 0">
-						<div v-for="(index, i) in rootConfig.indexes" class="ui label tiny">
+					<div v-if="config.indexes.length > 0">
+						<div v-for="(index, i) in config.indexes" class="ui label small basic">
 							{{index}} <a href="" title="删除" @click.prevent="removeIndex(i)"><i class="icon remove"></i></a>
 						</div>
 						<div class="ui divider"></div>
@@ -82,10 +93,31 @@ Vue.component("http-web-root-box", {
 					<p class="comment">在URL中只有目录没有文件名时默认查找的首页文件。</p>
 				</td>
 			</tr>
+			<tr>
+				<td>例外URL</td>
+				<td>
+					<url-patterns-box v-model="config.exceptURLPatterns"></url-patterns-box>
+					<p class="comment">如果填写了例外URL，表示不支持通过这些URL访问。</p>
+				</td>
+			</tr>
+			<tr>
+				<td>限制URL</td>
+				<td>
+					<url-patterns-box v-model="config.onlyURLPatterns"></url-patterns-box>
+					<p class="comment">如果填写了限制URL，表示仅支持通过这些URL访问。</p>
+				</td>
+			</tr>	
+			<tr>
+				<td>排除隐藏文件</td>
+				<td>
+					<checkbox v-model="config.exceptHiddenFiles"></checkbox>
+					<p class="comment">排除以点（.）符号开头的隐藏目录或文件，比如<code-label>/.git/logs/HEAD</code-label></p>
+				</td>
+			</tr>
 			<tr>
 				<td>去除URL前缀</td>
 				<td>
-					<input type="text" v-model="rootConfig.stripPrefix" placeholder="/PREFIX"/>
+					<input type="text" v-model="config.stripPrefix" placeholder="/PREFIX"/>
 					<p class="comment">可以把请求的路径部分前缀去除后再查找文件，比如把 <span class="ui label tiny">/web/app/index.html</span> 去除前缀 <span class="ui label tiny">/web</span> 后就变成 <span class="ui label tiny">/app/index.html</span>。 </p>
 				</td>
 			</tr>
@@ -93,17 +125,17 @@ Vue.component("http-web-root-box", {
 				<td>路径解码</td>
 				<td>
 					<div class="ui checkbox">
-						<input type="checkbox" v-model="rootConfig.decodePath"/>
+						<input type="checkbox" v-model="config.decodePath"/>
 						<label></label>	
 					</div>
 					<p class="comment">是否对请求路径进行URL解码，比如把 <span class="ui label tiny">/Web+App+Browser.html</span> 解码成 <span class="ui label tiny">/Web App Browser.html</span> 再查找文件。</p>
 				</td>
 			</tr>
 			<tr>
-				<td>是否终止请求</td>
+				<td>终止请求</td>
 				<td>
 					<div class="ui checkbox">
-						<input type="checkbox" v-model="rootConfig.isBreak"/>
+						<input type="checkbox" v-model="config.isBreak"/>
 						<label></label>	
 					</div>
 					<p class="comment">在找不到要访问的文件的情况下是否终止请求并返回404，如果选择终止请求，则不再尝试反向代理等设置。</p>