audit: hash time.Time values in map fields #2689
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
jefferai
reviewed
May 8, 2017
audit/hashstructure.go
Outdated
| @@ -232,6 +270,7 @@ func (w *hashWalker) Primitive(v reflect.Value) error { | |||
| mk := w.csData.(reflect.Value) | |||
| m.SetMapIndex(mk, resultVal) | |||
| default: | |||
| println(w.loc) | |||
jefferai
reviewed
May 8, 2017
audit/hashstructure.go
Outdated
|
|
||
| // Walk it as if it were a primitive value with the string value. | ||
| // This will replace the currenty map value (which is a time.Time). | ||
| if err := w.Primitive(reflect.ValueOf(v.Interface().(time.Time).String())); err != nil { |
There was a problem hiding this comment.
This puts out a Go-style string -- can you .Format(time.RFC3339Nano) it?
There was a problem hiding this comment.
(I realize that since it gets hashed it basically doesn't really matter since you're unlikely to try to decode the value, but for consistency...)
This enables audit.Hash to hash time.Time values that may exist as direct fields in the map. This will error (instead of panic) for any time.Time values that don't occur within map values. For example, this does not support a time.Time within a slice. If that needs to be supported then modifications will need to be made. This also requires an update to reflectwalk (included in this PR). This is a minimal change that allows SkipEntry to signal to skip an entire struct. We do this because we don't want to walk any of time.Time since we handle it directly.
|
Thanks! |
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.
This enables audit.Hash to hash time.Time values that may exist as
direct fields in the map. This will error (instead of panic) for any
time.Time values that don't occur within map values. For example, this
does not support a time.Time within a slice. If that needs to be
supported then modifications will need to be made.
This also requires an update to reflectwalk (included in this PR). This
is a minimal change that allows SkipEntry to signal to skip an entire
struct. We do this because we don't want to walk any of time.Time since
we handle it directly.
Fixes #2687