scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Error on violating SysView boundaries

Browse Source
This commit is contained in:
vishalnayak
2015-09-17 11:24:46 -04:00
parent 586c1a6889
commit fd6a63550c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
logical/framework/backend.go
View File

@@ -178,6 +178,7 @@ func (b *Backend) System() logical.SystemView {
// those with the SystemView values. If they are empty default values are set. // those with the SystemView values. If they are empty default values are set.
// If they are set, their boundaries are validated. // If they are set, their boundaries are validated.
func (b *Backend) SanitizeTTL(ttlStr, maxTTLStr string) (ttl, maxTTL time.Duration, err error) { func (b *Backend) SanitizeTTL(ttlStr, maxTTLStr string) (ttl, maxTTL time.Duration, err error) {
sysMaxTTL := b.System().MaxLeaseTTL()
if len(ttlStr) == 0 { if len(ttlStr) == 0 {
ttl = b.System().DefaultLeaseTTL() ttl = b.System().DefaultLeaseTTL()
} else { } else {
@@ -185,8 +186,10 @@ func (b *Backend) SanitizeTTL(ttlStr, maxTTLStr string) (ttl, maxTTL time.Durati
if err != nil { if err != nil {
return 0, 0, fmt.Errorf("Invalid ttl: %s", err) return 0, 0, fmt.Errorf("Invalid ttl: %s", err)
} }
if ttl > sysMaxTTL {
return 0, 0, fmt.Errorf("\"ttl\" value must be less than allowed max lease TTL value '%s'", sysMaxTTL.String())
}
} }
sysMaxTTL := b.System().MaxLeaseTTL()
if len(maxTTLStr) == 0 { if len(maxTTLStr) == 0 {
maxTTL = sysMaxTTL maxTTL = sysMaxTTL
} else { } else {
@@ -194,9 +197,9 @@ func (b *Backend) SanitizeTTL(ttlStr, maxTTLStr string) (ttl, maxTTL time.Durati
if err != nil { if err != nil {
return 0, 0, fmt.Errorf("Invalid max_ttl: %s", err) return 0, 0, fmt.Errorf("Invalid max_ttl: %s", err)
} }
} if maxTTL > sysMaxTTL {
if maxTTL > sysMaxTTL { return 0, 0, fmt.Errorf("\"max_ttl\" value must be less than allowed max lease TTL value '%s'", sysMaxTTL.String())
maxTTL = sysMaxTTL }
} }
if ttl > maxTTL { if ttl > maxTTL {
ttl = maxTTL ttl = maxTTL