Guardium rel 1.10 #958
Merged
Guardium rel 1.10 #958
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
Codecov Report
@@ Coverage Diff @@
## develop #958 +/- ##
===========================================
- Coverage 64.72% 64.65% -0.07%
===========================================
Files 517 517
Lines 48597 48804 +207
===========================================
+ Hits 31452 31554 +102
- Misses 17145 17250 +105
Continue to review full report at Codecov.
|
delliott90
reviewed
May 24, 2022
| DEFAULT_DAYS_BACK = 2 | ||
|
|
||
|
|
||
| class QueryStringPatternTranslator: | ||
| # Change comparator values to match with supported data source operators |
There was a problem hiding this comment.
remove the comparator_lookup, it's not needed since they are now defined in operators.json.
There was a problem hiding this comment.
Removed the comparator_lookup.
delliott90
reviewed
May 24, 2022
|
|
||
| def __init__(self, pattern: Pattern, data_model_mapper, options, transformers): | ||
| self.dmm = data_model_mapper | ||
| self.comparator_lookup = self.dmm.map_comparator() |
There was a problem hiding this comment.
This needs to remain since the comparator_lookup is now defined in the data model mapper rather than calling on the comparator_lookup dictionary at the top of the query_constructor.
delliott90
reviewed
May 24, 2022
| @@ -513,7 +596,7 @@ def _parse_expression(self, expression, qualifier=None) -> str: | |||
| # Multiple data source fields may map to the same STIX Object | |||
| mapped_fields_array = self.dmm.map_field(stix_object, stix_field) | |||
| # Resolve the comparison symbol to use in the query string (usually just ':') | |||
| comparator = self.comparator_lookup[str(expression.comparator)] | |||
delliott90
reviewed
May 24, 2022
| @@ -551,7 +635,7 @@ def _parse_expression(self, expression, qualifier=None) -> str: | |||
| return "{}".format(comparison_string) | |||
|
|
|||
| elif isinstance(expression, CombinedComparisonExpression): | |||
| operator = self.comparator_lookup[str(expression.operator)] | |||
There was a problem hiding this comment.
Keep as is. This line shouldn't have been changed.
delliott90
reviewed
May 24, 2022
| @@ -569,15 +653,17 @@ def _parse_expression(self, expression, qualifier=None) -> str: | |||
| return self._parse_expression(expression.comparison_expression, qualifier) | |||
| elif hasattr(expression, 'qualifier') and hasattr(expression, 'observation_expression'): | |||
| if isinstance(expression.observation_expression, CombinedObservationExpression): | |||
| operator = self.comparator_lookup[str(expression.observation_expression.operator)] | |||
delliott90
reviewed
May 24, 2022
| elif isinstance(expression, CombinedObservationExpression): | ||
| operator = self.comparator_lookup[str(expression.operator)] |
delliott90
requested changes
May 24, 2022
|
I have worked on the comments and done with the changes. Please check. |
delliott90
approved these changes
May 25, 2022
delliott90
pushed a commit
that referenced
this pull request
May 25, 2022
Update Guardium connector to use the STIX IN operator in queries.
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.
No description provided.