Add BackendType to existing backends (#3078)

This commit is contained in:
Calvin Leung Huang
2017-07-28 14:04:46 -04:00
committed by GitHub
parent 158c21905e
commit dd72c96dc8
22 changed files with 49 additions and 41 deletions

View File

@@ -63,7 +63,6 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
"login/*",
},
},
Paths: framework.PathAppend([]*framework.Path{
pathLogin(&b),
pathLoginWithAppIDPath(&b),
@@ -71,10 +70,9 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
b.MapAppId.Paths(),
b.MapUserId.Paths(),
),
AuthRenew: b.pathLoginRenew,
Invalidate: b.invalidate,
AuthRenew: b.pathLoginRenew,
Invalidate: b.invalidate,
BackendType: logical.TypeCredential,
}
b.view = conf.StorageView

View File

@@ -96,7 +96,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
pathTidySecretID(b),
},
),
Invalidate: b.invalidate,
Invalidate: b.invalidate,
BackendType: logical.TypeCredential,
}
return b, nil
}

View File

@@ -113,8 +113,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
pathIdentityWhitelist(b),
pathTidyIdentityWhitelist(b),
},
Invalidate: b.invalidate,
Invalidate: b.invalidate,
BackendType: logical.TypeCredential,
}
return b, nil

View File

@@ -20,13 +20,11 @@ func Backend() *backend {
var b backend
b.Backend = &framework.Backend{
Help: backendHelp,
PathsSpecial: &logical.Paths{
Unauthenticated: []string{
"login",
},
},
Paths: append([]*framework.Path{
pathConfig(&b),
pathLogin(&b),
@@ -34,10 +32,9 @@ func Backend() *backend {
pathCerts(&b),
pathCRLs(&b),
}),
AuthRenew: b.pathLoginRenew,
Invalidate: b.invalidate,
AuthRenew: b.pathLoginRenew,
Invalidate: b.invalidate,
BackendType: logical.TypeCredential,
}
b.crlUpdateMutex = &sync.RWMutex{}

View File

@@ -50,7 +50,8 @@ func Backend() *backend {
pathLogin(&b),
}, allPaths...),
AuthRenew: b.pathLoginRenew,
AuthRenew: b.pathLoginRenew,
BackendType: logical.TypeCredential,
}
return &b

View File

@@ -43,7 +43,8 @@ func Backend() *backend {
mfa.MFAPaths(b.Backend, pathLogin(&b))...,
),
AuthRenew: b.pathLoginRenew,
AuthRenew: b.pathLoginRenew,
BackendType: logical.TypeCredential,
}
return &b

View File

@@ -35,7 +35,8 @@ func Backend() *backend {
pathLogin(&b),
}),
AuthRenew: b.pathLoginRenew,
AuthRenew: b.pathLoginRenew,
BackendType: logical.TypeCredential,
}
return &b

View File

@@ -36,7 +36,8 @@ func Backend() *backend {
mfa.MFAPaths(b.Backend, pathLogin(&b))...,
),
AuthRenew: b.pathLoginRenew,
AuthRenew: b.pathLoginRenew,
BackendType: logical.TypeCredential,
}
return &b

View File

@@ -36,7 +36,8 @@ func Backend() *backend {
mfa.MFAPaths(b.Backend, pathLogin(&b))...,
),
AuthRenew: b.pathLoginRenew,
AuthRenew: b.pathLoginRenew,
BackendType: logical.TypeCredential,
}
return &b

View File

@@ -42,6 +42,7 @@ func Backend() *backend {
WALRollback: walRollback,
WALRollbackMinAge: 5 * time.Minute,
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -40,6 +40,7 @@ func Backend() *backend {
Clean: func() {
b.ResetDB(nil)
},
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -26,6 +26,7 @@ func Backend() *backend {
Secrets: []*framework.Secret{
secretToken(&b),
},
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -40,10 +40,9 @@ func Backend(conf *logical.BackendConfig) *databaseBackend {
Secrets: []*framework.Secret{
secretCreds(&b),
},
Clean: b.closeAllDBs,
Invalidate: b.invalidate,
Clean: b.closeAllDBs,
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
b.logger = conf.Logger

View File

@@ -38,7 +38,8 @@ func Backend() *framework.Backend {
Clean: b.ResetSession,
Invalidate: b.invalidate,
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
return b.Backend

View File

@@ -36,9 +36,9 @@ func Backend() *backend {
secretCreds(&b),
},
Invalidate: b.invalidate,
Clean: b.ResetDB,
Invalidate: b.invalidate,
Clean: b.ResetDB,
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -36,9 +36,9 @@ func Backend() *backend {
secretCreds(&b),
},
Invalidate: b.invalidate,
Clean: b.ResetDB,
Invalidate: b.invalidate,
Clean: b.ResetDB,
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -68,6 +68,8 @@ func Backend() *backend {
Secrets: []*framework.Secret{
secretCerts(&b),
},
BackendType: logical.TypeLogical,
}
b.crlLifetime = time.Hour * 72

View File

@@ -37,9 +37,9 @@ func Backend(conf *logical.BackendConfig) *backend {
secretCreds(&b),
},
Clean: b.ResetDB,
Invalidate: b.invalidate,
Clean: b.ResetDB,
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
b.logger = conf.Logger

View File

@@ -38,9 +38,9 @@ func Backend() *backend {
secretCreds(&b),
},
Clean: b.resetClient,
Invalidate: b.invalidate,
Clean: b.resetClient,
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
return &b

View File

@@ -62,7 +62,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
secretOTP(&b),
},
Invalidate: b.invalidate,
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
return &b, nil
}

View File

@@ -28,7 +28,8 @@ func Backend() *backend {
pathCode(&b),
},
Secrets: []*framework.Secret{},
Secrets: []*framework.Secret{},
BackendType: logical.TypeLogical,
}
b.usedCodes = cache.New(0, 30*time.Second)

View File

@@ -38,9 +38,9 @@ func Backend(conf *logical.BackendConfig) *backend {
b.pathVerify(),
},
Secrets: []*framework.Secret{},
Invalidate: b.invalidate,
Secrets: []*framework.Secret{},
Invalidate: b.invalidate,
BackendType: logical.TypeLogical,
}
b.lm = keysutil.NewLockManager(conf.System.CachingDisabled())