luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Don't use context in barrier type/recovery type

This commit is contained in:
Jeff Mitchell 2018-01-19 03:17:36 -05:00
parent f8b03795f9
commit 6be5b8e8a1
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vault/rekey.go
View File

@ -149,7 +149,7 @@ func (c *Core) BarrierRekeyInit(ctx context.Context, config *SealConfig) error {
}
}
if c.seal.RecoveryKeySupported(ctx) && c.seal.RecoveryType(ctx) == config.Type {
if c.seal.RecoveryKeySupported(ctx) && c.seal.RecoveryType() == config.Type {
c.logger.Debug("core: using recovery seal configuration to rekey barrier key")
}

4
vault/rekey_test.go
View File

@ -145,9 +145,9 @@ func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root str
// Start a rekey
var expType string
if recovery {
expType = c.seal.RecoveryType(context.Background())
expType = c.seal.RecoveryType()
} else {
expType = c.seal.BarrierType(context.Background())
expType = c.seal.BarrierType()
}
newConf := &SealConfig{

18
vault/seal.go
View File

@ -72,12 +72,12 @@ type Seal interface {
SetStoredKeys(context.Context, [][]byte) error
GetStoredKeys(context.Context) ([][]byte, error)
BarrierType(context.Context) string
BarrierType() string
BarrierConfig(context.Context) (*SealConfig, error)
SetBarrierConfig(context.Context, *SealConfig) error
RecoveryKeySupported(context.Context) bool
RecoveryType(context.Context) string
RecoveryType() string
RecoveryConfig(context.Context) (*SealConfig, error)
SetRecoveryConfig(context.Context, *SealConfig) error
SetRecoveryKey(context.Context, []byte) error
@ -108,7 +108,7 @@ func (d *DefaultSeal) Finalize(ctx context.Context) error {
return nil
}
func (d *DefaultSeal) BarrierType(ctx context.Context) string {
func (d *DefaultSeal) BarrierType() string {
return SealTypeShamir
}
@ -161,11 +161,11 @@ func (d *DefaultSeal) BarrierConfig(ctx context.Context) (*SealConfig, error) {
switch conf.Type {
// This case should not be valid for other types as only this is the default
case "":
conf.Type = d.BarrierType(ctx)
case d.BarrierType(ctx):
conf.Type = d.BarrierType()
case d.BarrierType():
default:
d.core.logger.Error("core: barrier seal type does not match loaded type", "barrier_seal_type", conf.Type, "loaded_seal_type", d.BarrierType(ctx))
return nil, fmt.Errorf("barrier seal type of %s does not match loaded type of %s", conf.Type, d.BarrierType(ctx))
d.core.logger.Error("core: barrier seal type does not match loaded type", "barrier_seal_type", conf.Type, "loaded_seal_type", d.BarrierType())
return nil, fmt.Errorf("barrier seal type of %s does not match loaded type of %s", conf.Type, d.BarrierType())
}
// Check for a valid seal configuration
@ -190,7 +190,7 @@ func (d *DefaultSeal) SetBarrierConfig(ctx context.Context, config *SealConfig)
return nil
}
config.Type = d.BarrierType(ctx)
config.Type = d.BarrierType()
// Encode the seal configuration
buf, err := json.Marshal(config)
@ -214,7 +214,7 @@ func (d *DefaultSeal) SetBarrierConfig(ctx context.Context, config *SealConfig)
return nil
}
func (d *DefaultSeal) RecoveryType(ctx context.Context) string {
func (d *DefaultSeal) RecoveryType() string {
return RecoveryTypeUnsupported
}