add organization ID check from JWT token for internal rules #85
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
Bee-lee
requested review from
bond95,
joselsegura,
natiiix,
quarckster,
Serhii1011010 and
tisnik
as code owners
tisnik
approved these changes
Jul 7, 2020
content/parsing.go
Outdated
|
|
||
| for _, ruleIDPart := range splitRuleID { | ||
| if ruleIDPart == internalRuleStr { | ||
| isInternal = true |
There was a problem hiding this comment.
I'd just return true here, but it's a nitpick :)
joselsegura
approved these changes
Jul 8, 2020
Codecov Report
@@ Coverage Diff @@
## master #85 +/- ##
==========================================
+ Coverage 42.09% 48.73% +6.63%
==========================================
Files 11 11
Lines 867 911 +44
==========================================
+ Hits 365 444 +79
+ Misses 462 413 -49
- Partials 40 54 +14
Continue to review full report at Codecov.
|
joselsegura
reviewed
Jul 9, 2020
| @@ -59,6 +59,15 @@ func (server HTTPServer) getContentForRule(writer http.ResponseWriter, request * | |||
| return | |||
| } | |||
|
|
|||
| // check for internal rule permissions | |||
| if internal := content.IsRuleInternal(ruleID); internal == true { | |||
There was a problem hiding this comment.
internal == true => internal
Just a nitpick
joselsegura
reviewed
Jul 9, 2020
| // check for internal rule permissions | ||
| if internal := content.IsRuleInternal(ruleID); internal == true { | ||
| ok := server.checkInternalRulePermissions(writer, request) | ||
| if ok != true { |
joselsegura
reviewed
Jul 9, 2020
Comment on lines
+133
to
+158
| RuleContentInternal1 = ics_content.RuleContent{ | ||
| Summary: testdata.Rule1.Summary, | ||
| Reason: testdata.Rule1.Reason, | ||
| Resolution: testdata.Rule1.Resolution, | ||
| MoreInfo: testdata.Rule1.MoreInfo, | ||
| Plugin: ics_content.RulePluginInfo{ | ||
| Name: testdata.Rule1.Name, | ||
| NodeID: "", | ||
| ProductCode: "", | ||
| PythonModule: internalTestRuleModule, | ||
| }, | ||
| ErrorKeys: map[string]ics_content.RuleErrorKeyContent{ | ||
| "ek1": { | ||
| Generic: testdata.RuleErrorKey1.Generic, | ||
| Metadata: ics_content.ErrorKeyMetadata{ | ||
| Condition: testdata.RuleErrorKey1.Condition, | ||
| Description: testdata.RuleErrorKey1.Description, | ||
| Impact: testdata.ImpactIntToStr[testdata.RuleErrorKey1.Impact], | ||
| Likelihood: testdata.RuleErrorKey1.Likelihood, | ||
| PublishDate: testdata.RuleErrorKey1.PublishDate.UTC().Format(time.RFC3339), | ||
| Tags: testdata.RuleErrorKey1.Tags, | ||
| Status: "active", | ||
| }, | ||
| }, | ||
| }, | ||
| } |
There was a problem hiding this comment.
Move this definition to testdata package in insights-results-aggregator-data repository, but it can be done later
joselsegura
approved these changes
Jul 9, 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.
Description
This adds a security check for internal rules based on organization ID
Fixes #76
Blocks RedHatInsights/insights-content-service#97
Blocked by https://github.com/RedHatInsights/e2e-deploy/pull/1923
Type of change
Testing steps
Modified requests to contain diffferent org_ids to test manually