From b0d2bdb0ba4413a4bfe351439c5468f198ac8a0e 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: Sat, 18 Dec 2021 17:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DHSTS=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=89=E6=95=88=E6=9C=9F=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components.js                   | 21 ++++++++++++++++++-
 .../js/components/server/ssl-config-box.js    | 21 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/web/public/js/components.js b/web/public/js/components.js
index 726cf2ef..b1e7eea7 100755
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -1711,7 +1711,7 @@ Vue.component("ssl-config-box", {
 		if (hsts == null) {
 			hsts = {
 				isOn: false,
-				maxAge: 0,
+				maxAge: 31536000,
 				includeSubDomains: false,
 				preload: false,
 				domains: []
@@ -2101,6 +2101,25 @@ Vue.component("ssl-config-box", {
 					</p>
 				</td>
 			</tr>
+			<tr v-show="hsts.isOn && hstsOptionsVisible">
+				<td class="color-border">HSTS有效时间<em>（max-age）</em></td>
+				<td>
+					<div class="ui fields inline">
+						<div class="ui field">
+							<input type="text" name="hstsMaxAge" v-model="hsts.maxAge" maxlength="10" size="10" @input="changeHSTSMaxAge()"/>
+						</div>
+						<div class="ui field">
+							秒
+						</div>
+						<div class="ui field">{{hsts.days}}天</div>
+					</div>
+					<p class="comment">
+						<a href="" @click.prevent="setHSTSMaxAge(31536000)" :class="{active:hsts.maxAge == 31536000}">[1年/365天]</a> &nbsp; &nbsp;
+						<a href="" @click.prevent="setHSTSMaxAge(15768000)" :class="{active:hsts.maxAge == 15768000}">[6个月/182.5天]</a> &nbsp;  &nbsp;
+						<a href="" @click.prevent="setHSTSMaxAge(2592000)"  :class="{active:hsts.maxAge == 2592000}">[1个月/30天]</a>
+					</p>
+				</td>
+			</tr>
 			<tr v-show="hsts.isOn && hstsOptionsVisible">
 				<td class="color-border">HSTS包含子域名<em>（includeSubDomains）</em></td>
 				<td>
diff --git a/web/public/js/components/server/ssl-config-box.js b/web/public/js/components/server/ssl-config-box.js
index 9fc5cb5a..52df15c0 100644
--- a/web/public/js/components/server/ssl-config-box.js
+++ b/web/public/js/components/server/ssl-config-box.js
@@ -45,7 +45,7 @@ Vue.component("ssl-config-box", {
 		if (hsts == null) {
 			hsts = {
 				isOn: false,
-				maxAge: 0,
+				maxAge: 31536000,
 				includeSubDomains: false,
 				preload: false,
 				domains: []
@@ -435,6 +435,25 @@ Vue.component("ssl-config-box", {
 					</p>
 				</td>
 			</tr>
+			<tr v-show="hsts.isOn && hstsOptionsVisible">
+				<td class="color-border">HSTS有效时间<em>（max-age）</em></td>
+				<td>
+					<div class="ui fields inline">
+						<div class="ui field">
+							<input type="text" name="hstsMaxAge" v-model="hsts.maxAge" maxlength="10" size="10" @input="changeHSTSMaxAge()"/>
+						</div>
+						<div class="ui field">
+							秒
+						</div>
+						<div class="ui field">{{hsts.days}}天</div>
+					</div>
+					<p class="comment">
+						<a href="" @click.prevent="setHSTSMaxAge(31536000)" :class="{active:hsts.maxAge == 31536000}">[1年/365天]</a> &nbsp; &nbsp;
+						<a href="" @click.prevent="setHSTSMaxAge(15768000)" :class="{active:hsts.maxAge == 15768000}">[6个月/182.5天]</a> &nbsp;  &nbsp;
+						<a href="" @click.prevent="setHSTSMaxAge(2592000)"  :class="{active:hsts.maxAge == 2592000}">[1个月/30天]</a>
+					</p>
+				</td>
+			</tr>
 			<tr v-show="hsts.isOn && hstsOptionsVisible">
 				<td class="color-border">HSTS包含子域名<em>（includeSubDomains）</em></td>
 				<td>