fix: check write permission in legacy write path #19980
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
danxmoran
commented
Nov 10, 2020
| @@ -954,8 +954,7 @@ func (m *Launcher) run(ctx context.Context) (err error) { | |||
| } | |||
| } | |||
|
|
|||
| // N.B. the BucketService used by the DBRP service doesn't perform authorization. | |||
| dbrpSvc := dbrp.NewAuthorizedService(dbrp.NewService(ctx, ts.BucketService, m.kvStore)) | |||
| dbrpSvc := dbrp.NewAuthorizedService(dbrp.NewService(ctx, authorizer.NewBucketService(ts.BucketService), m.kvStore)) | |||
There was a problem hiding this comment.
Adding this back in didn't fix the problem, but I was nervous about what other unknown effects it might be having.
danxmoran
commented
Nov 10, 2020
danxmoran
commented
Nov 10, 2020
| @@ -94,7 +93,7 @@ func TestWriteHandler_BucketAndMappingExists(t *testing.T) { | |||
| handler := NewWriterHandler(&PointsWriterBackend{ | |||
| HTTPErrorHandler: DefaultErrorHandler, | |||
| Logger: zaptest.NewLogger(t), | |||
| BucketService: authorizer.NewBucketService(bucketService), | |||
| BucketService: bucketService, | |||
There was a problem hiding this comment.
I believe this accurately reflects the setup constructed by the influxd launcher. It'd be nice to have one setup function that both the tests and main code could call, to ensure they stay in sync.
docmerlin
reviewed
Nov 10, 2020
| @@ -105,6 +104,84 @@ func TestWriteHandler_BucketAndMappingExists(t *testing.T) { | |||
| assert.Equal(t, "", w.Body.String()) | |||
| } | |||
|
|
|||
| func TestWriteHandler_BucketAndMappingExistsNoPermissions(t *testing.T) { | |||
There was a problem hiding this comment.
Yes, good, this should help a lot.
stuartcarnie
requested changes
Nov 10, 2020
danxmoran
force-pushed
the
dm-legacy-write-auth-19974
branch
from
ca7af25
to
94be2e4
Compare
stuartcarnie
approved these changes
Nov 10, 2020
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.
Closes #19974
This is a big of a hack, it doesn't fit how we structure our auth checks elsewhere. Suggestions appreciated!