域名解析增加EdgeDNS API

internal/web/actions/default/dns/providers/createPopup.go

@@ -73,6 +73,12 @@ func (this *CreatePopupAction) RunPost(params struct {
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
 
+	// EdgeDNS API
+	ParamEdgeDNSAPIRole            string
+	ParamEdgeDNSAPIHost            string
+	ParamEdgeDNSAPIAccessKeyId     string
+	ParamEdgeDNSAPIAccessKeySecret string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -121,6 +127,20 @@ func (this *CreatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.ParamCloudFlareAPIKey
 		apiParams["email"] = params.ParamCloudFlareEmail
+	case "edgeDNSAPI":
+		params.Must.
+			Field("paramEdgeDNSAPIHost", params.ParamEdgeDNSAPIHost).
+			Require("请输入API地址").
+			Field("paramEdgeDNSAPIRole", params.ParamEdgeDNSAPIRole).
+			Require("请选择AccessKey类型").
+			Field("paramEdgeDNSAPIAccessKeyId", params.ParamEdgeDNSAPIAccessKeyId).
+			Require("请输入AccessKey ID").
+			Field("paramEdgeDNSAPIAccessKeySecret", params.ParamEdgeDNSAPIAccessKeySecret).
+			Require("请输入AccessKey密钥")
+		apiParams["host"] = params.ParamEdgeDNSAPIHost
+		apiParams["role"] = params.ParamEdgeDNSAPIRole
+		apiParams["accessKeyId"] = params.ParamEdgeDNSAPIAccessKeyId
+		apiParams["accessKeySecret"] = params.ParamEdgeDNSAPIAccessKeySecret
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

internal/web/actions/default/dns/providers/updatePopup.go

@@ -100,6 +100,12 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
 
+	// EdgeDNS API
+	ParamEdgeDNSAPIHost            string
+	ParamEdgeDNSAPIRole            string
+	ParamEdgeDNSAPIAccessKeyId     string
+	ParamEdgeDNSAPIAccessKeySecret string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -150,6 +156,20 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.ParamCloudFlareAPIKey
 		apiParams["email"] = params.ParamCloudFlareEmail
+	case "edgeDNSAPI":
+		params.Must.
+			Field("paramEdgeDNSAPIHost", params.ParamEdgeDNSAPIHost).
+			Require("请输入API地址").
+			Field("paramEdgeDNSAPIRole", params.ParamEdgeDNSAPIRole).
+			Require("请选择AccessKey类型").
+			Field("paramEdgeDNSAPIAccessKeyId", params.ParamEdgeDNSAPIAccessKeyId).
+			Require("请输入AccessKey ID").
+			Field("paramEdgeDNSAPIAccessKeySecret", params.ParamEdgeDNSAPIAccessKeySecret).
+			Require("请输入AccessKey密钥")
+		apiParams["host"] = params.ParamEdgeDNSAPIHost
+		apiParams["role"] = params.ParamEdgeDNSAPIRole
+		apiParams["accessKeyId"] = params.ParamEdgeDNSAPIAccessKeyId
+		apiParams["accessKeySecret"] = params.ParamEdgeDNSAPIAccessKeySecret
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

web/public/js/components.js

@@ -1779,7 +1779,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 		<http-cache-refs-config-box :v-cache-config="cacheConfig" :v-cache-refs="cacheConfig.cacheRefs" :v-web-id="vWebId"></http-cache-refs-config-box>
 	</div>
 	<div class="margin"></div>
-</div>`});let defaultGeneralHeaders=["Cache-Control","Connection","Date","Pragma","Trailer","Transfer-Encoding","Upgrade","Via","Warning"];function sortTable(n){let e=document.createElement("script");e.setAttribute("src","/js/sortable.min.js"),e.addEventListener("load",function(){let s=document.querySelector("#sortable-table");null!=s&&Sortable.create(s,{draggable:"tbody",handle:".icon.handle",onStart:function(){},onUpdate:function(e){let t=s.querySelectorAll("tbody"),i=[];t.forEach(function(e){i.push(parseInt(e.getAttribute("v-id")))}),n(i)}})}),document.head.appendChild(e)}function sortLoad(e){let t=document.createElement("script");t.setAttribute("src","/js/sortable.min.js"),t.addEventListener("load",function(){"function"==typeof e&&e()}),document.head.appendChild(t)}function emitClick(e,arguments){let t=["click"];for(let e=0;e<arguments.length;e++)t.push(arguments[e]);e.$emit.apply(e,t)}Vue.component("http-cond-general-header-length",{props:["v-checkpoint"],data:function(){let e=null,t=null;var i;null!=window.parent.UPDATING_RULE&&(null!=(i=window.parent.UPDATING_RULE.checkpointOptions).headers&&Array.$isArray(i.headers)&&(e=i.headers),null!=i.length&&(t=i.length)),null==e&&(e=defaultGeneralHeaders),null==t&&(t=128);let s=this;return setTimeout(function(){s.change()},100),{headers:e,length:t}},watch:{length:function(e){let t=parseInt(e);(t=isNaN(t)?0:t)<0&&(t=0),this.length=t,this.change()}},methods:{change:function(){this.vCheckpoint.options=[{code:"headers",value:this.headers},{code:"length",value:this.length}]}},template:`<div>
+</div>`});let defaultGeneralHeaders=["Cache-Control","Connection","Date","Pragma","Trailer","Transfer-Encoding","Upgrade","Via","Warning"];Vue.component("http-cond-general-header-length",{props:["v-checkpoint"],data:function(){let e=null,t=null;var i;null!=window.parent.UPDATING_RULE&&(null!=(i=window.parent.UPDATING_RULE.checkpointOptions).headers&&Array.$isArray(i.headers)&&(e=i.headers),null!=i.length&&(t=i.length)),null==e&&(e=defaultGeneralHeaders),null==t&&(t=128);let s=this;return setTimeout(function(){s.change()},100),{headers:e,length:t}},watch:{length:function(e){let t=parseInt(e);(t=isNaN(t)?0:t)<0&&(t=0),this.length=t,this.change()}},methods:{change:function(){this.vCheckpoint.options=[{code:"headers",value:this.headers},{code:"length",value:this.length}]}},template:`<div>
 	<table class="ui table">
 		<tr>
 			<td class="title">通用Header列表</td>
@@ -3050,7 +3050,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 			</tr>
 		</tbody>
 	</table>
-</div>`}),Vue.component("http-access-log-box",{props:["v-access-log","v-keyword","v-show-server-link"],data:function(){let e=this.vAccessLog;if(null!=e.header&&null!=e.header.Upgrade&&null!=e.header.Upgrade.values&&e.header.Upgrade.values.$contains("websocket")&&("http"==e.scheme?e.scheme="ws":"https"==e.scheme&&(e.scheme="wss")),null!=e.tags&&0<e.tags.length){let s={};e.tags=e.tags.$filter(function(e,t){var i=void 0===s[t];return s[t]=!0,i})}return{accessLog:e}},methods:{formatCost:function(e){if(null==e)return"0";let t=(1e3*e).toString(),i=t.split(".");return i.length<2?t:i[0]+"."+i[1].substring(0,3)},showLog:function(){let e=this;var t=this.accessLog.requestId;this.$parent.$children.forEach(function(e){null!=e.deselect&&e.deselect()}),this.select(),teaweb.popup("/servers/server/log/viewPopup?requestId="+t,{width:"50em",height:"28em",onClose:function(){e.deselect()}})},select:function(){this.$refs.box.parentNode.style.cssText="background: rgba(0, 0, 0, 0.1)"},deselect:function(){this.$refs.box.parentNode.style.cssText=""},mismatch:function(){teaweb.warn("当前访问没有匹配到任何网站服务")}},template:`<div style="word-break: break-all" :style="{'color': (accessLog.status >= 400) ? '#dc143c' : ''}" ref="box">
+</div>`}),Vue.component("http-access-log-box",{props:["v-access-log","v-keyword","v-show-server-link"],data:function(){let e=this.vAccessLog;if(null!=e.header&&null!=e.header.Upgrade&&null!=e.header.Upgrade.values&&e.header.Upgrade.values.$contains("websocket")&&("http"==e.scheme?e.scheme="ws":"https"==e.scheme&&(e.scheme="wss")),null!=e.tags&&0<e.tags.length){let s={};e.tags=e.tags.$filter(function(e,t){var i=void 0===s[t];return s[t]=!0,i})}var t;return e.unicodeHost="",null!=e.host&&e.host.startsWith("xn--")&&(t=e.host.indexOf(":"),e.unicodeHost=0<t?punycode.ToUnicode(e.host.substring(0,t)):punycode.ToUnicode(e.host)),{accessLog:e}},methods:{formatCost:function(e){if(null==e)return"0";let t=(1e3*e).toString(),i=t.split(".");return i.length<2?t:i[0]+"."+i[1].substring(0,3)},showLog:function(){let e=this;var t=this.accessLog.requestId;this.$parent.$children.forEach(function(e){null!=e.deselect&&e.deselect()}),this.select(),teaweb.popup("/servers/server/log/viewPopup?requestId="+t,{width:"50em",height:"28em",onClose:function(){e.deselect()}})},select:function(){this.$refs.box.parentNode.style.cssText="background: rgba(0, 0, 0, 0.1)"},deselect:function(){this.$refs.box.parentNode.style.cssText=""},mismatch:function(){teaweb.warn("当前访问没有匹配到任何网站服务")}},template:`<div style="word-break: break-all" :style="{'color': (accessLog.status >= 400) ? '#dc143c' : ''}" ref="box">
 	<div>
 		<a v-if="accessLog.node != null && accessLog.node.nodeCluster != null" :href="'/clusters/cluster/node?nodeId=' + accessLog.node.id + '&clusterId=' + accessLog.node.nodeCluster.id" title="点击查看节点详情" target="_top"><span class="grey">[{{accessLog.node.name}}<span v-if="!accessLog.node.name.endsWith('节点')">节点</span>]</span></a>
 		
@@ -3058,8 +3058,19 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 		<a :href="'/servers/server/log?serverId=' + accessLog.serverId" title="点击到网站服务" v-if="vShowServerLink && accessLog.serverId > 0"><span class="grey">[服务]</span></a>
 		<span v-if="vShowServerLink && (accessLog.serverId == null || accessLog.serverId == 0)" @click.prevent="mismatch()"><span class="disabled">[服务]</span></span>
 		
-		<span v-if="accessLog.region != null && accessLog.region.length > 0" class="grey"><ip-box :v-ip="accessLog.remoteAddr">[{{accessLog.region}}]</ip-box></span> <ip-box><keyword :v-word="vKeyword">{{accessLog.remoteAddr}}</keyword></ip-box> [{{accessLog.timeLocal}}] <em>&quot;<keyword :v-word="vKeyword">{{accessLog.requestMethod}}</keyword> {{accessLog.scheme}}://<keyword :v-word="vKeyword">{{accessLog.host}}</keyword><keyword :v-word="vKeyword">{{accessLog.requestURI}}</keyword> <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> <keyword :v-word="vKeyword">{{accessLog.status}}</keyword> <code-label v-if="accessLog.attrs != null && (accessLog.attrs['cache.status'] == 'HIT' || accessLog.attrs['cache.status'] == 'STALE')">cache {{accessLog.attrs['cache.status'].toLowerCase()}}</code-label> <code-label v-if="accessLog.firewallActions != null && accessLog.firewallActions.length > 0">waf {{accessLog.firewallActions}}</code-label> <span v-if="accessLog.tags != null && accessLog.tags.length > 0">- <code-label v-for="tag in accessLog.tags" :key="tag">{{tag}}</code-label></span>
+		<span v-if="accessLog.region != null && accessLog.region.length > 0" class="grey"><ip-box :v-ip="accessLog.remoteAddr">[{{accessLog.region}}]</ip-box></span> 
+		<ip-box><keyword :v-word="vKeyword">{{accessLog.remoteAddr}}</keyword></ip-box> [{{accessLog.timeLocal}}] <em>&quot;<keyword :v-word="vKeyword">{{accessLog.requestMethod}}</keyword> {{accessLog.scheme}}://<keyword :v-word="vKeyword">{{accessLog.host}}</keyword><keyword :v-word="vKeyword">{{accessLog.requestURI}}</keyword> <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> <keyword :v-word="vKeyword">{{accessLog.status}}</keyword> 
 		
+		<code-label v-if="accessLog.unicodeHost != null && accessLog.unicodeHost.length > 0">{{accessLog.unicodeHost}}</code-label>
+		
+		<!-- attrs -->
+		<code-label v-if="accessLog.attrs != null && (accessLog.attrs['cache.status'] == 'HIT' || accessLog.attrs['cache.status'] == 'STALE')">cache {{accessLog.attrs['cache.status'].toLowerCase()}}</code-label> 
+		<!-- waf -->
+		<code-label v-if="accessLog.firewallActions != null && accessLog.firewallActions.length > 0">waf {{accessLog.firewallActions}}</code-label> 
+		
+		<!-- tags -->
+		<span v-if="accessLog.tags != null && accessLog.tags.length > 0">- <code-label v-for="tag in accessLog.tags" :key="tag">{{tag}}</code-label>
+		</span>
 		<span  v-if="accessLog.wafInfo != null">
 			<a :href="(accessLog.wafInfo.policy.serverId == 0) ? '/servers/components/waf/group?firewallPolicyId=' +  accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId+ '#set' + accessLog.firewallRuleSetId : '/servers/server/settings/waf/group?serverId=' + accessLog.serverId + '&firewallPolicyId=' + accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId + '#set' + accessLog.firewallRuleSetId" target="_blank">
 				<code-label-plain>
@@ -3075,7 +3086,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 		<span v-if="accessLog.requestTime != null"> - 耗时:{{formatCost(accessLog.requestTime)}} ms </span><span v-if="accessLog.humanTime != null && accessLog.humanTime.length > 0" class="grey small">&nbsp; ({{accessLog.humanTime}})</span>
 		&nbsp; <a href="" @click.prevent="showLog" title="查看详情"><i class="icon expand"></i></a>
 	</div>
-</div>`}),Vue.component("http-firewall-block-options-viewer",{props:["v-block-options"],data:function(){return{options:this.vBlockOptions}},template:`<div>
+</div>`});var punycode=new function(){this.utf16={decode:function(e){for(var t,i,s=[],n=0,o=e.length;n<o;){if(55296==(63488&(t=e.charCodeAt(n++)))){if(i=e.charCodeAt(n++),55296!=(64512&t)||56320!=(64512&i))throw new RangeError("UTF-16(decode): Illegal UTF-16 sequence");t=((1023&t)<<10)+(1023&i)+65536}s.push(t)}return s},encode:function(e){for(var t,i=[],s=0,n=e.length;s<n;){if(55296==(63488&(t=e[s++])))throw new RangeError("UTF-16(encode): Illegal UTF-16 value");65535<t&&(t-=65536,i.push(String.fromCharCode(t>>>10&1023|55296)),t=56320|1023&t),i.push(String.fromCharCode(t))}return i.join("")}};var b=2147483647;function y(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function x(e,t,i){var s;for(e=i?Math.floor(e/700):e>>1,e+=Math.floor(e/t),s=0;455<e;s+=36)e=Math.floor(e/35);return Math.floor(s+36*e/(e+38))}this.decode=function(e,t){var i,s,n,o,a,l,c,r,d=[],p=[],u=e.length,h=128,v=0,m=72,f=e.lastIndexOf("-");for(f<0&&(f=0),s=0;s<f;++s){if(t&&(p[d.length]=e.charCodeAt(s)-65<26),128<=e.charCodeAt(s))throw new RangeError("Illegal input >= 0x80");d.push(e.charCodeAt(s))}for(n=0<f?f+1:0;n<u;){for(o=v,a=1,l=36;;l+=36){if(u<=n)throw RangeError("punycode_bad_input(1)");if(36<=(r=(r=e.charCodeAt(n++))-48<10?r-22:r-65<26?r-65:r-97<26?r-97:36))throw RangeError("punycode_bad_input(2)");if(r>Math.floor((b-v)/a))throw RangeError("punycode_overflow(1)");if(v+=r*a,r<(r=l<=m?1:m+26<=l?26:l-m))break;if(a>Math.floor(b/(36-r)))throw RangeError("punycode_overflow(2)");a*=36-r}if(m=x(v-o,i=d.length+1,0===o),Math.floor(v/i)>b-h)throw RangeError("punycode_overflow(3)");h+=Math.floor(v/i),v%=i,t&&p.splice(v,0,e.charCodeAt(n-1)-65<26),d.splice(v,0,h),v++}if(t)for(v=0,c=d.length;v<c;v++)p[v]&&(d[v]=String.fromCharCode(d[v]).toUpperCase().charCodeAt(0));return this.utf16.encode(d)},this.encode=function(e,t){t&&(r=this.utf16.decode(e));var i,s,n,o,a,l,c,r,d=(e=this.utf16.decode(e.toLowerCase())).length;if(t)for(g=0;g<d;g++)r[g]=e[g]!=r[g];for(var p,u,h=[],v=128,m=0,f=72,g=0;g<d;++g)e[g]<128&&h.push(String.fromCharCode(r?(p=e[g],u=r[g],(p-=(p-97<26)<<5)+((!u&&p-65<26)<<5)):e[g]));for(i=s=h.length,0<s&&h.push("-");i<d;){for(n=b,g=0;g<d;++g)v<=(c=e[g])&&c<n&&(n=c);if(n-v>Math.floor((b-m)/(i+1)))throw RangeError("punycode_overflow (1)");for(m+=(n-v)*(i+1),v=n,g=0;g<d;++g){if((c=e[g])<v&&++m>b)return Error("punycode_overflow(2)");if(c==v){for(o=m,a=36;!(o<(l=a<=f?1:f+26<=a?26:a-f));a+=36)h.push(String.fromCharCode(y(l+(o-l)%(36-l),0))),o=Math.floor((o-l)/(36-l));h.push(String.fromCharCode(y(o,t&&r[g]?1:0))),f=x(m,i+1,i==s),m=0,++i}}++m,++v}return h.join("")},this.ToASCII=function(e){for(var t=e.split("."),i=[],s=0;s<t.length;++s){var n=t[s];i.push(n.match(/[^A-Za-z0-9-]/)?"xn--"+punycode.encode(n):n)}return i.join(".")},this.ToUnicode=function(e){for(var t=e.split("."),i=[],s=0;s<t.length;++s){var n=t[s];i.push(n.match(/^xn--/)?punycode.decode(n.slice(4)):n)}return i.join(".")}};function sortTable(n){let e=document.createElement("script");e.setAttribute("src","/js/sortable.min.js"),e.addEventListener("load",function(){let s=document.querySelector("#sortable-table");null!=s&&Sortable.create(s,{draggable:"tbody",handle:".icon.handle",onStart:function(){},onUpdate:function(e){let t=s.querySelectorAll("tbody"),i=[];t.forEach(function(e){i.push(parseInt(e.getAttribute("v-id")))}),n(i)}})}),document.head.appendChild(e)}function sortLoad(e){let t=document.createElement("script");t.setAttribute("src","/js/sortable.min.js"),t.addEventListener("load",function(){"function"==typeof e&&e()}),document.head.appendChild(t)}function emitClick(e,arguments){let t=["click"];for(let e=0;e<arguments.length;e++)t.push(arguments[e]);e.$emit.apply(e,t)}Vue.component("http-firewall-block-options-viewer",{props:["v-block-options"],data:function(){return{options:this.vBlockOptions}},template:`<div>
 	<span v-if="options == null">默认设置</span>
 	<div v-else>
 		状态码：{{options.statusCode}} / 提示内容：<span v-if="options.body != null && options.body.length > 0">[{{options.body.length}}字符]</span><span v-else class="disabled">[无]</span>  / 超时时间：{{options.timeout}}秒

web/public/js/components.src.js

@@ -8737,6 +8737,18 @@ Vue.component("http-access-log-box", {
 			})
 		}
 
+		// 域名
+		accessLog.unicodeHost = ""
+		if (accessLog.host != null && accessLog.host.startsWith("xn--")) {
+			// port
+			let portIndex = accessLog.host.indexOf(":")
+			if (portIndex > 0) {
+				accessLog.unicodeHost = punycode.ToUnicode(accessLog.host.substring(0, portIndex))
+			} else {
+				accessLog.unicodeHost = punycode.ToUnicode(accessLog.host)
+			}
+		}
+
 		return {
 			accessLog: accessLog
 		}
@@ -8789,8 +8801,19 @@ Vue.component("http-access-log-box", {
 		<a :href="'/servers/server/log?serverId=' + accessLog.serverId" title="点击到网站服务" v-if="vShowServerLink && accessLog.serverId > 0"><span class="grey">[服务]</span></a>
 		<span v-if="vShowServerLink && (accessLog.serverId == null || accessLog.serverId == 0)" @click.prevent="mismatch()"><span class="disabled">[服务]</span></span>
 		
-		<span v-if="accessLog.region != null && accessLog.region.length > 0" class="grey"><ip-box :v-ip="accessLog.remoteAddr">[{{accessLog.region}}]</ip-box></span> <ip-box><keyword :v-word="vKeyword">{{accessLog.remoteAddr}}</keyword></ip-box> [{{accessLog.timeLocal}}] <em>&quot;<keyword :v-word="vKeyword">{{accessLog.requestMethod}}</keyword> {{accessLog.scheme}}://<keyword :v-word="vKeyword">{{accessLog.host}}</keyword><keyword :v-word="vKeyword">{{accessLog.requestURI}}</keyword> <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> <keyword :v-word="vKeyword">{{accessLog.status}}</keyword> <code-label v-if="accessLog.attrs != null && (accessLog.attrs['cache.status'] == 'HIT' || accessLog.attrs['cache.status'] == 'STALE')">cache {{accessLog.attrs['cache.status'].toLowerCase()}}</code-label> <code-label v-if="accessLog.firewallActions != null && accessLog.firewallActions.length > 0">waf {{accessLog.firewallActions}}</code-label> <span v-if="accessLog.tags != null && accessLog.tags.length > 0">- <code-label v-for="tag in accessLog.tags" :key="tag">{{tag}}</code-label></span>
+		<span v-if="accessLog.region != null && accessLog.region.length > 0" class="grey"><ip-box :v-ip="accessLog.remoteAddr">[{{accessLog.region}}]</ip-box></span> 
+		<ip-box><keyword :v-word="vKeyword">{{accessLog.remoteAddr}}</keyword></ip-box> [{{accessLog.timeLocal}}] <em>&quot;<keyword :v-word="vKeyword">{{accessLog.requestMethod}}</keyword> {{accessLog.scheme}}://<keyword :v-word="vKeyword">{{accessLog.host}}</keyword><keyword :v-word="vKeyword">{{accessLog.requestURI}}</keyword> <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> <keyword :v-word="vKeyword">{{accessLog.status}}</keyword> 
 		
+		<code-label v-if="accessLog.unicodeHost != null && accessLog.unicodeHost.length > 0">{{accessLog.unicodeHost}}</code-label>
+		
+		<!-- attrs -->
+		<code-label v-if="accessLog.attrs != null && (accessLog.attrs['cache.status'] == 'HIT' || accessLog.attrs['cache.status'] == 'STALE')">cache {{accessLog.attrs['cache.status'].toLowerCase()}}</code-label> 
+		<!-- waf -->
+		<code-label v-if="accessLog.firewallActions != null && accessLog.firewallActions.length > 0">waf {{accessLog.firewallActions}}</code-label> 
+		
+		<!-- tags -->
+		<span v-if="accessLog.tags != null && accessLog.tags.length > 0">- <code-label v-for="tag in accessLog.tags" :key="tag">{{tag}}</code-label>
+		</span>
 		<span  v-if="accessLog.wafInfo != null">
 			<a :href="(accessLog.wafInfo.policy.serverId == 0) ? '/servers/components/waf/group?firewallPolicyId=' +  accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId+ '#set' + accessLog.firewallRuleSetId : '/servers/server/settings/waf/group?serverId=' + accessLog.serverId + '&firewallPolicyId=' + accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId + '#set' + accessLog.firewallRuleSetId" target="_blank">
 				<code-label-plain>
@@ -8809,6 +8832,333 @@ Vue.component("http-access-log-box", {
 </div>`
 })
 
+// Javascript Punycode converter derived from example in RFC3492.
+// This implementation is created by some@domain.name and released into public domain
+// 代码来自：https://stackoverflow.com/questions/183485/converting-punycode-with-dash-character-to-unicode
+var punycode = new function Punycode() {
+	// This object converts to and from puny-code used in IDN
+	//
+	// punycode.ToASCII ( domain )
+	//
+	// Returns a puny coded representation of "domain".
+	// It only converts the part of the domain name that
+	// has non ASCII characters. I.e. it dosent matter if
+	// you call it with a domain that already is in ASCII.
+	//
+	// punycode.ToUnicode (domain)
+	//
+	// Converts a puny-coded domain name to unicode.
+	// It only converts the puny-coded parts of the domain name.
+	// I.e. it dosent matter if you call it on a string
+	// that already has been converted to unicode.
+	//
+	//
+	this.utf16 = {
+		// The utf16-class is necessary to convert from javascripts internal character representation to unicode and back.
+		decode: function (input) {
+			var output = [], i = 0, len = input.length, value, extra;
+			while (i < len) {
+				value = input.charCodeAt(i++);
+				if ((value & 0xF800) === 0xD800) {
+					extra = input.charCodeAt(i++);
+					if (((value & 0xFC00) !== 0xD800) || ((extra & 0xFC00) !== 0xDC00)) {
+						throw new RangeError("UTF-16(decode): Illegal UTF-16 sequence");
+					}
+					value = ((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000;
+				}
+				output.push(value);
+			}
+			return output;
+		},
+		encode: function (input) {
+			var output = [], i = 0, len = input.length, value;
+			while (i < len) {
+				value = input[i++];
+				if ((value & 0xF800) === 0xD800) {
+					throw new RangeError("UTF-16(encode): Illegal UTF-16 value");
+				}
+				if (value > 0xFFFF) {
+					value -= 0x10000;
+					output.push(String.fromCharCode(((value >>> 10) & 0x3FF) | 0xD800));
+					value = 0xDC00 | (value & 0x3FF);
+				}
+				output.push(String.fromCharCode(value));
+			}
+			return output.join("");
+		}
+	}
+
+	//Default parameters
+	var initial_n = 0x80;
+	var initial_bias = 72;
+	var delimiter = "\x2D";
+	var base = 36;
+	var damp = 700;
+	var tmin = 1;
+	var tmax = 26;
+	var skew = 38;
+	var maxint = 0x7FFFFFFF;
+
+	// decode_digit(cp) returns the numeric value of a basic code
+	// point (for use in representing integers) in the range 0 to
+	// base-1, or base if cp is does not represent a value.
+
+	function decode_digit(cp) {
+		return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : cp - 97 < 26 ? cp - 97 : base;
+	}
+
+	// encode_digit(d,flag) returns the basic code point whose value
+	// (when used for representing integers) is d, which needs to be in
+	// the range 0 to base-1. The lowercase form is used unless flag is
+	// nonzero, in which case the uppercase form is used. The behavior
+	// is undefined if flag is nonzero and digit d has no uppercase form.
+
+	function encode_digit(d, flag) {
+		return d + 22 + 75 * (d < 26) - ((flag != 0) << 5);
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+	}
+
+	//** Bias adaptation function **
+	function adapt(delta, numpoints, firsttime) {
+		var k;
+		delta = firsttime ? Math.floor(delta / damp) : (delta >> 1);
+		delta += Math.floor(delta / numpoints);
+
+		for (k = 0; delta > (((base - tmin) * tmax) >> 1); k += base) {
+			delta = Math.floor(delta / (base - tmin));
+		}
+		return Math.floor(k + (base - tmin + 1) * delta / (delta + skew));
+	}
+
+	// encode_basic(bcp,flag) forces a basic code point to lowercase if flag is zero,
+	// uppercase if flag is nonzero, and returns the resulting code point.
+	// The code point is unchanged if it is caseless.
+	// The behavior is undefined if bcp is not a basic code point.
+
+	function encode_basic(bcp, flag) {
+		bcp -= (bcp - 97 < 26) << 5;
+		return bcp + ((!flag && (bcp - 65 < 26)) << 5);
+	}
+
+	// Main decode
+	this.decode = function (input, preserveCase) {
+		// Dont use utf16
+		var output = [];
+		var case_flags = [];
+		var input_length = input.length;
+
+		var n, out, i, bias, basic, j, ic, oldi, w, k, digit, t, len;
+
+		// Initialize the state:
+
+		n = initial_n;
+		i = 0;
+		bias = initial_bias;
+
+		// Handle the basic code points: Let basic be the number of input code
+		// points before the last delimiter, or 0 if there is none, then
+		// copy the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) basic = 0;
+
+		for (j = 0; j < basic; ++j) {
+			if (preserveCase) case_flags[output.length] = (input.charCodeAt(j) - 65 < 26);
+			if (input.charCodeAt(j) >= 0x80) {
+				throw new RangeError("Illegal input >= 0x80");
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: Start just after the last delimiter if any
+		// basic code points were copied; start at the beginning otherwise.
+
+		for (ic = basic > 0 ? basic + 1 : 0; ic < input_length;) {
+
+			// ic is the index of the next character to be consumed,
+
+			// Decode a generalized variable-length integer into delta,
+			// which gets added to i. The overflow checking is easier
+			// if we increase i as we go, then subtract off its starting
+			// value at the end to obtain delta.
+			for (oldi = i, w = 1, k = base; ; k += base) {
+				if (ic >= input_length) {
+					throw RangeError("punycode_bad_input(1)");
+				}
+				digit = decode_digit(input.charCodeAt(ic++));
+
+				if (digit >= base) {
+					throw RangeError("punycode_bad_input(2)");
+				}
+				if (digit > Math.floor((maxint - i) / w)) {
+					throw RangeError("punycode_overflow(1)");
+				}
+				i += digit * w;
+				t = k <= bias ? tmin : k >= bias + tmax ? tmax : k - bias;
+				if (digit < t) {
+					break;
+				}
+				if (w > Math.floor(maxint / (base - t))) {
+					throw RangeError("punycode_overflow(2)");
+				}
+				w *= (base - t);
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi === 0);
+
+			// i was supposed to wrap around from out to 0,
+			// incrementing n each time, so we'll fix that now:
+			if (Math.floor(i / out) > maxint - n) {
+				throw RangeError("punycode_overflow(3)");
+			}
+			n += Math.floor(i / out);
+			i %= out;
+
+			// Insert n at position i of the output:
+			// Case of last character determines uppercase flag:
+			if (preserveCase) {
+				case_flags.splice(i, 0, input.charCodeAt(ic - 1) - 65 < 26);
+			}
+
+			output.splice(i, 0, n);
+			i++;
+		}
+		if (preserveCase) {
+			for (i = 0, len = output.length; i < len; i++) {
+				if (case_flags[i]) {
+					output[i] = (String.fromCharCode(output[i]).toUpperCase()).charCodeAt(0);
+				}
+			}
+		}
+		return this.utf16.encode(output);
+	};
+
+	//** Main encode function **
+
+	this.encode = function (input, preserveCase) {
+		//** Bias adaptation function **
+
+		var n, delta, h, b, bias, j, m, q, k, t, ijv, case_flags;
+
+		if (preserveCase) {
+			// Preserve case, step1 of 2: Get a list of the unaltered string
+			case_flags = this.utf16.decode(input);
+		}
+		// Converts the input in UTF-16 to Unicode
+		input = this.utf16.decode(input.toLowerCase());
+
+		var input_length = input.length; // Cache the length
+
+		if (preserveCase) {
+			// Preserve case, step2 of 2: Modify the list to true/false
+			for (j = 0; j < input_length; j++) {
+				case_flags[j] = input[j] != case_flags[j];
+			}
+		}
+
+		var output = [];
+
+
+		// Initialize the state:
+		n = initial_n;
+		delta = 0;
+		bias = initial_bias;
+
+		// Handle the basic code points:
+		for (j = 0; j < input_length; ++j) {
+			if (input[j] < 0x80) {
+				output.push(
+					String.fromCharCode(
+						case_flags ? encode_basic(input[j], case_flags[j]) : input[j]
+					)
+				);
+			}
+		}
+
+		h = b = output.length;
+
+		// h is the number of code points that have been handled, b is the
+		// number of basic code points
+
+		if (b > 0) output.push(delimiter);
+
+		// Main encoding loop:
+		//
+		while (h < input_length) {
+			// All non-basic code points < n have been
+			// handled already. Find the next larger one:
+
+			for (m = maxint, j = 0; j < input_length; ++j) {
+				ijv = input[j];
+				if (ijv >= n && ijv < m) m = ijv;
+			}
+
+			// Increase delta enough to advance the decoder's
+			// <n,i> state to <m,0>, but guard against overflow:
+
+			if (m - n > Math.floor((maxint - delta) / (h + 1))) {
+				throw RangeError("punycode_overflow (1)");
+			}
+			delta += (m - n) * (h + 1);
+			n = m;
+
+			for (j = 0; j < input_length; ++j) {
+				ijv = input[j];
+
+				if (ijv < n) {
+					if (++delta > maxint) return Error("punycode_overflow(2)");
+				}
+
+				if (ijv == n) {
+					// Represent delta as a generalized variable-length integer:
+					for (q = delta, k = base; ; k += base) {
+						t = k <= bias ? tmin : k >= bias + tmax ? tmax : k - bias;
+						if (q < t) break;
+						output.push(String.fromCharCode(encode_digit(t + (q - t) % (base - t), 0)));
+						q = Math.floor((q - t) / (base - t));
+					}
+					output.push(String.fromCharCode(encode_digit(q, preserveCase && case_flags[j] ? 1 : 0)));
+					bias = adapt(delta, h + 1, h == b);
+					delta = 0;
+					++h;
+				}
+			}
+
+			++delta, ++n;
+		}
+		return output.join("");
+	}
+
+	this.ToASCII = function (domain) {
+		var domain_array = domain.split(".");
+		var out = [];
+		for (var i = 0; i < domain_array.length; ++i) {
+			var s = domain_array[i];
+			out.push(
+				s.match(/[^A-Za-z0-9-]/) ?
+					"xn--" + punycode.encode(s) :
+					s
+			);
+		}
+		return out.join(".");
+	}
+	this.ToUnicode = function (domain) {
+		var domain_array = domain.split(".");
+		var out = [];
+		for (var i = 0; i < domain_array.length; ++i) {
+			var s = domain_array[i];
+			out.push(
+				s.match(/^xn--/) ?
+					punycode.decode(s.slice(4)) :
+					s
+			);
+		}
+		return out.join(".");
+	}
+}();
+
 Vue.component("http-firewall-block-options-viewer", {
 	props: ["v-block-options"],
 	data: function () {

web/views/@default/dns/providers/createPopup.html

@@ -191,7 +191,7 @@
             </tr>
         </tbody>
 
-        <!-- Edge DNS -->
+        <!-- EdgeDNS -->
         <tbody v-if="type == 'localEdgeDNS'">
             <tr>
                 <td>选择域名服务集群 *</td>
@@ -204,6 +204,37 @@
             </tr>
         </tbody>
 
+        <!-- EdgeDNS API -->
+        <tbody v-if="type == 'edgeDNSAPI'">
+            <tr>
+                <td>API地址 *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIHost" maxlength="100"/>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey类型 *</td>
+                <td>
+                    <select class="ui dropdown auto-width" name="paramEdgeDNSAPIRole">
+                        <option value="user">平台用户</option>
+                        <option value="admin">管理员</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey ID *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIAccessKeyId" maxlength="64"/>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey密钥 *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIAccessKeySecret" maxlength="64"/>
+                </td>
+            </tr>
+        </tbody>
+
         <!-- 自定义HTTP-->
         <tbody v-if="type == 'customHTTP'">
             <tr>

web/views/@default/dns/providers/provider.html

@@ -148,6 +148,29 @@
         </tr>
     </tbody>
 
+    <!-- EdgeDNS API -->
+    <tbody v-if="provider.type == 'edgeDNSAPI'">
+        <tr>
+            <td class="color-border">API地址</td>
+            <td>{{provider.apiParams.host}}</td>
+        </tr>
+        <tr>
+            <td class="color-border">AccessKey类型</td>
+            <td>
+                <span v-if="provider.apiParams.role == 'user'">平台用户</span>
+                <span v-if="provider.apiParams.role == 'admin'">管理员</span>
+            </td>
+        </tr>
+        <tr>
+            <td class="color-border">AccessKey ID</td>
+            <td>{{provider.apiParams.accessKeyId}}</td>
+        </tr>
+        <tr>
+            <td class="color-border">AccessKey密钥</td>
+            <td>{{provider.apiParams.accessKeySecret}}</td>
+        </tr>
+    </tbody>
+
     <!-- CustomHTTP -->
     <tbody v-if="provider.type == 'customHTTP'">
         <tr>

web/views/@default/dns/providers/updatePopup.html

@@ -191,7 +191,7 @@
             </tr>
         </tbody>
 
-        <!-- Edge DNS -->
+        <!-- EdgeDNS -->
         <tbody v-if="provider.type == 'localEdgeDNS'">
             <tr>
                 <td>选择域名服务集群 *</td>
@@ -204,6 +204,38 @@
             </tr>
         </tbody>
 
+
+        <!-- EdgeDNS API -->
+        <tbody v-if="provider.type == 'edgeDNSAPI'">
+            <tr>
+                <td>API地址 *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIHost" maxlength="100" v-model="provider.params.host"/>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey类型 *</td>
+                <td>
+                    <select class="ui dropdown auto-width" name="paramEdgeDNSAPIRole" v-model="provider.params.role">
+                        <option value="user">平台用户</option>
+                        <option value="admin">管理员</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey ID *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIAccessKeyId" maxlength="64" v-model="provider.params.accessKeyId"/>
+                </td>
+            </tr>
+            <tr>
+                <td>AccessKey密钥 *</td>
+                <td>
+                    <input type="text" name="paramEdgeDNSAPIAccessKeySecret" maxlength="64" v-model="provider.params.accessKeySecret"/>
+                </td>
+            </tr>
+        </tbody>
+
         <!-- 自定义HTTP-->
         <tbody v-if="provider.type == 'customHTTP'">
         <tr>