dry run rotate [T813] #269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vixentael
reviewed
Oct 10, 2018
| @@ -152,43 +79,36 @@ func rotateDb(selectQuery, updateQuery string, db *sql.DB, keystore keystore.Key | |||
| return false | |||
| } | |||
| logger := log.WithFields(log.Fields{"ZoneId": string(acraStructID)}) | |||
| logger.Infof("Rotate AcraStruct with ZoneId=%s", string(acraStructID)) | |||
| logger.Infof("Rotate AcraStruct") | |||
There was a problem hiding this comment.
why we don't log zone id anymore?
There was a problem hiding this comment.
I think we should log smth like Rotating in dry-run mode if dry-run is true
There was a problem hiding this comment.
why we don't log zone id anymore?
because row above create logger with zone as field that always will be included in log messages
I think we should log smth like Rotating in dry-run mode if dry-run is true
agree
vixentael
reviewed
Oct 10, 2018
| return output, nil | ||
| } | ||
|
|
||
| // runFileRotation read map zones to files, re-generate zone key pairs and re-encrypt files | ||
| func runFileRotation(fileMapConfigPath string, keystorage keystore.KeyStore) { | ||
| func runFileRotation(fileMapConfigPath string, keystorage keystore.KeyStore, dryRun bool) { | ||
| fileMap, err := loadFileMap(fileMapConfigPath) | ||
| if err != nil { | ||
| log.WithError(err).Errorln("Can't load config with map <ZoneId>: <FilePath>") | ||
| os.Exit(1) | ||
| } |
There was a problem hiding this comment.
Same, I think we should log "Starting in .. dry-run mode"
vixentael
reviewed
Oct 10, 2018
| } | ||
|
|
||
| func (rotator *keyRotator) clearKeys() { | ||
| for _, keypair := range rotator.newKeypairs { |
vixentael
reviewed
Oct 10, 2018
cmd/acra-rotate/rotator.go
Outdated
| logger.WithField("acrastruct", hex.EncodeToString(acrastruct)).WithError(err).Errorln("Can't decrypt AcraStruct") | ||
| return nil, err | ||
| } | ||
| utils.FillSlice(0, privateKey.Value) |
vixentael
reviewed
Oct 10, 2018
| } | ||
| decrypted, err := base.DecryptAcrastruct(acrastruct, privateKey, zoneID) | ||
| if err != nil { | ||
| logger.WithField("acrastruct", hex.EncodeToString(acrastruct)).WithError(err).Errorln("Can't decrypt AcraStruct") |
There was a problem hiding this comment.
maybe it worth zero-ing private key in case of error too?
vixentael
reviewed
Oct 10, 2018
| @@ -105,26 +106,27 @@ func testGeneratingDataEncryptionKeys(store *FilesystemKeyStore, t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| func checkPath(path string, t *testing.T) { | |||
vixentael
approved these changes
Oct 10, 2018
vixentael
reviewed
Oct 11, 2018
| @@ -57,12 +57,13 @@ func (rotator *keyRotator) rotateAcrastruct(zoneID, acrastruct []byte) ([]byte, | |||
| logger.WithField("acrastruct", hex.EncodeToString(acrastruct)).WithError(err).Errorln("Can't get private key") | |||
| return nil, err | |||
| } | |||
| defer utils.FillSlice(0, privateKey.Value) | |||
|
Looks awesome! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
acra-rotatewith flag--dry-runwill fetch acrastructs (from files or database), decrypt, rotate in memory keys, encrypt with new public keys and print result json with new public keys without saving rotated keys and acrastructs (to filesystem or database)