mirror of
https://github.com/Luzifer/ots.git
synced 2025-04-19 06:55:51 -04:00
if default expiry is not defined but max expiry, make default expiry = max expiry
This commit is contained in:
parent
140fa575fd
commit
a514b0bd76
7
api.go
7
api.go
@ -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
|
||||
}
|
||||
|
@ -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: [],
|
||||
}
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user