if default expiry is not defined but max expiry, make default expiry = max expiry

This commit is contained in:
tchbla 2023-12-18 11:59:20 +01:00
parent 140fa575fd
commit a514b0bd76
No known key found for this signature in database
2 changed files with 11 additions and 4 deletions

7
api.go
View File

@ -62,15 +62,16 @@ func (a apiServer) handleCreate(res http.ResponseWriter, r *http.Request) {
r.Body = http.MaxBytesReader(res, r.Body, cust.MaxSecretSize*2) //nolint:gomnd
}
if cfg.DefaultSecretExpiry == 0 && cfg.MaxSecretExpiry > 0 {
cfg.DefaultSecretExpiry = cfg.MaxSecretExpiry
}
var (
expiry = cfg.DefaultSecretExpiry
secret string
)
if !cust.DisableExpiryOverride {
if cfg.DefaultSecretExpiry == 0 && cfg.MaxSecretExpiry > 0 {
cfg.DefaultSecretExpiry = cfg.MaxSecretExpiry
}
if ev, err := strconv.ParseInt(r.URL.Query().Get("expire"), 10, 64); err == nil && (ev <= cfg.MaxSecretExpiry || cfg.MaxSecretExpiry == 0) {
expiry = ev
}

View File

@ -116,6 +116,12 @@
/* global maxSecretExpire */
/* global defaultSecretExpire */
let defaultSecretExpire_overwrite = defaultSecretExpire
if( defaultSecretExpire == 0 && maxSecretExpire > 0 ){
defaultSecretExpire_overwrite = maxSecretExpire
}
import appCrypto from '../crypto.js'
import { bytesToHuman } from '../helpers'
@ -218,7 +224,7 @@ export default {
fileSize: 0,
secret: '',
securePassword: null,
selectedExpiry: defaultSecretExpire,
selectedExpiry: defaultSecretExpire_overwrite,
selectedFileMeta: [],
}
},