-
Notifications
You must be signed in to change notification settings - Fork 424
Validate decoded fields in GobDecode to prevent nil noise, invalid bounds, and division by zero #404
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AndyBurecovics
wants to merge
1
commit into
google:main
Choose a base branch
from
AndyBurecovics:fix/gobdecode-validation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Validate decoded fields in GobDecode to prevent nil noise, invalid bounds, and division by zero #404
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package dpagg | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/google/differential-privacy/go/v4/checks" | ||
| "github.com/google/differential-privacy/go/v4/noise" | ||
| ) | ||
|
|
||
| // validateDecodedNoise rejects NoiseKind values that don't correspond to a | ||
| // concrete Noise implementation; without this gate, Result() panics on a nil | ||
| // receiver after deserializing a tampered payload. | ||
| func validateDecodedNoise(kind noise.Kind) (noise.Noise, error) { | ||
| n := noise.ToNoise(kind) | ||
| if n == nil { | ||
| return nil, fmt.Errorf("unsupported NoiseKind value %d", kind) | ||
| } | ||
| return n, nil | ||
| } | ||
|
|
||
| // validateDecodedAggregation mirrors the precondition checks that New*() | ||
| // constructors already perform, applied to fields recovered from gob bytes. | ||
| func validateDecodedAggregation(epsilon, delta, lInfSensitivity float64, l0Sensitivity int64, kind noise.Kind) (noise.Noise, error) { | ||
| n, err := validateDecodedNoise(kind) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if err := checks.CheckEpsilonVeryStrict(epsilon); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := checks.CheckDelta(delta); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := checks.CheckL0Sensitivity(l0Sensitivity); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := checks.CheckLInfSensitivity(lInfSensitivity); err != nil { | ||
| return nil, err | ||
| } | ||
| return n, nil | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -379,6 +379,9 @@ func (bm *BoundedMean) GobDecode(data []byte) error { | |
| if err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedMean from bytes") | ||
| } | ||
| if err := checks.CheckBoundsFloat64(enc.Lower, enc.Upper); err != nil { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For mean & variance, I think we could call validateDecodedAggregation on the underlying Count and Sum objects for completeness. |
||
| return fmt.Errorf("couldn't decode BoundedMean: %v", err) | ||
| } | ||
| *bm = BoundedMean{ | ||
| lower: enc.Lower, | ||
| upper: enc.Upper, | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -376,6 +376,13 @@ func (bs *BoundedSumInt64) GobDecode(data []byte) error { | |
| if err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumInt64 from bytes") | ||
| } | ||
| nObj, err := validateDecodedAggregation(enc.Epsilon, enc.Delta, float64(enc.LInfSensitivity), enc.L0Sensitivity, enc.NoiseKind) | ||
| if err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumInt64: %v", err) | ||
| } | ||
| if err := checks.CheckBoundsInt64(enc.Lower, enc.Upper); err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumInt64: %v", err) | ||
| } | ||
| *bs = BoundedSumInt64{ | ||
| epsilon: enc.Epsilon, | ||
| delta: enc.Delta, | ||
|
|
@@ -384,7 +391,7 @@ func (bs *BoundedSumInt64) GobDecode(data []byte) error { | |
| lower: enc.Lower, | ||
| upper: enc.Upper, | ||
| noiseKind: enc.NoiseKind, | ||
| Noise: noise.ToNoise(enc.NoiseKind), | ||
| Noise: nObj, | ||
| sum: enc.Sum, | ||
| state: defaultState, | ||
| } | ||
|
|
@@ -693,6 +700,13 @@ func (bs *BoundedSumFloat64) GobDecode(data []byte) error { | |
| if err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumFloat64 from bytes") | ||
| } | ||
| nObj2, err := validateDecodedAggregation(enc.Epsilon, enc.Delta, enc.LInfSensitivity, enc.L0Sensitivity, enc.NoiseKind) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: |
||
| if err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumFloat64: %v", err) | ||
| } | ||
| if err := checks.CheckBoundsFloat64(enc.Lower, enc.Upper); err != nil { | ||
| return fmt.Errorf("couldn't decode BoundedSumFloat64: %v", err) | ||
| } | ||
| *bs = BoundedSumFloat64{ | ||
| epsilon: enc.Epsilon, | ||
| delta: enc.Delta, | ||
|
|
@@ -701,7 +715,7 @@ func (bs *BoundedSumFloat64) GobDecode(data []byte) error { | |
| lower: enc.Lower, | ||
| upper: enc.Upper, | ||
| noiseKind: enc.NoiseKind, | ||
| Noise: noise.ToNoise(enc.NoiseKind), | ||
| Noise: nObj2, | ||
| sum: enc.Sum, | ||
| state: defaultState, | ||
| } | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might make sense to move this to
go/checks/directory.