fix[frontend]: parsing 's' in expiration

SharzyL · SharzyL · commit b0cc58e4715c · 2024-06-05T23:10:36.000+08:00
diff --git a/frontend/index.client.js b/frontend/index.client.js
@@ -68,7 +68,7 @@ window.addEventListener('DOMContentLoaded', () => {
   let customName = '', adminUrl = '', file = null
 
   const NAME_REGEX = /^[a-zA-Z0-9+_\-\[\]*$@,;]{3,}$/
-  const EXPIRE_REGEX = /^\d+\s*[mhdwM]?$/
+  const EXPIRE_REGEX = /^\d+\s*[smhdwM]?$/
   const submitButton = $('#submit-button')
   const deleteButton = $('#delete-button')
   const pasteEditArea = $('#paste-textarea')
diff --git a/src/common.js b/src/common.js
@@ -75,7 +75,7 @@ export function parsePath(pathname) {
 }
 
 export function parseExpiration(expirationStr) {
-  const EXPIRE_REGEX = /^[\d\.]+\s*[mhdwM]?$/
+  const EXPIRE_REGEX = /^[\d\.]+\s*[smhdwM]?$/
   if (!EXPIRE_REGEX.test(expirationStr)) {
     throw new WorkerError(400, `‘${expirationStr}’ is not a valid expiration specification`)
   }
@@ -136,4 +136,4 @@ export function getDispFilename(fields) {
 
 export function isLegalUrl(url) {
   return URL.canParse(url)
-}
+}
diff --git a/src/index.js b/src/index.js
@@ -45,4 +45,3 @@ async function handleNormalRequest(request, env, ctx) {
     throw new WorkerError(405, "method not allowed")
   }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export function parsePath(pathname) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`export function parseExpiration(expirationStr) {`
`78`		`- const EXPIRE_REGEX = /^[\d\.]+\s*[mhdwM]?$/`
	`78`	`+ const EXPIRE_REGEX = /^[\d\.]+\s*[smhdwM]?$/`
`79`	`79`	`if (!EXPIRE_REGEX.test(expirationStr)) {`
`80`	`80`	throw new WorkerError(400, `‘${expirationStr}’ is not a valid expiration specification`)
`81`	`81`	`}`
`@@ -136,4 +136,4 @@ export function getDispFilename(fields) {`
`136`	`136`
`137`	`137`	`export function isLegalUrl(url) {`
`138`	`138`	`return URL.canParse(url)`
`139`		`-}`
	`139`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,3 @@ async function handleNormalRequest(request, env, ctx) {`
`45`	`45`	`throw new WorkerError(405, "method not allowed")`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`-`