kairos/kcrypt-challenger
1
0
Fork 0
mirror of https://github.com/kairos-io/kcrypt-challenger.git synced 2025-07-14 07:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract method and simplify "if" logic

Browse Source 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis 2023-01-19 15:46:35 +02:00
parent 83f529b53d
commit eefd5f2c2c
No known key found for this signature in database
GPG Key ID: 286DCAFD2C97DDE3
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/discovery/client/client.go
View File

@ -89,11 +89,27 @@ func (c *Client) waitPass(p *block.Partition, attempts int) (pass string, err er
return rand, err return rand, err
} }
} }
for tries := 0; tries < attempts; tries++ { for tries := 0; tries < attempts; tries++ {
var generated bool var generated bool
pass, generated, err = getPass(challengeEndpoint, p) pass, generated, err = getPass(challengeEndpoint, p)
if generated { if generated { // passphrase is encrypted
// Decode what the challenger server gave us return c.decryptPassphrase(pass)
}
if err == nil || err == errPartNotFound { // passphrase not encrypted or not available
return
}
time.Sleep(1 * time.Second) // network errors? retry
}
return
}
// decryptPassphrase decodes (base64) and decrypts the passphrase returned
// by the challenger server.
func (c *Client) decryptPassphrase(pass string) (string, error) {
blob, err := base64.RawURLEncoding.DecodeString(pass) blob, err := base64.RawURLEncoding.DecodeString(pass)
if err != nil { if err != nil {
return "", err return "", err
@ -107,18 +123,7 @@ func (c *Client) waitPass(p *block.Partition, attempts int) (pass string, err er
if c.Config.Kcrypt.Challenger.TPMDevice != "" { if c.Config.Kcrypt.Challenger.TPMDevice != "" {
opts = append(opts, tpm.WithDevice(c.Config.Kcrypt.Challenger.TPMDevice)) opts = append(opts, tpm.WithDevice(c.Config.Kcrypt.Challenger.TPMDevice))
} }
pass, err := tpm.DecodeBlob(blob, opts...) passBytes, err := tpm.DecodeBlob(blob, opts...)
return string(pass), err
}
if pass != "" || err == nil { return string(passBytes), err
return
}
if err == errPartNotFound {
return
}
// Otherwise, we might have a generic network error and we retry
time.Sleep(1 * time.Second)
}
return
} }