-
Notifications
You must be signed in to change notification settings - Fork 10
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
ENG-50887: Mask value using a masking config #227
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
46b1921
create masking config
siddhant2001 5e424ae
WIP: time range filter
siddhant2001 4f178ae
working
siddhant2001 a2a381c
fix app.conf
siddhant2001 e167411
comments
siddhant2001 1167c62
remove comment
siddhant2001 3201839
remove state
siddhant2001 22a7c05
stateless changes
siddhant2001 e033b5b
spotless
siddhant2001 0421c5d
comments
siddhant2001 345b5c5
comments
siddhant2001 4559457
tests
siddhant2001 e89416f
logical col idx
siddhant2001 858fbbc
Merge branch 'main' into mask-unbofuscated-cookies
siddhant2001 19e4834
application.conf comments
siddhant2001 a055b31
remove stale comments
siddhant2001 398ac00
Merge branch 'mask-unbofuscated-cookies' of github.com:hypertrace/que…
siddhant2001 fdfcfcb
comments
siddhant2001 8fd154f
changes
siddhant2001 041e520
change config
siddhant2001 916076e
cleanup tests
siddhant2001 7b5e7ca
change
siddhant2001 dc54e02
refactor
siddhant2001 612f3bd
remove extra line
siddhant2001 02d2d72
refactor
siddhant2001 4ebe89c
refactor
siddhant2001 5375d85
list to set
siddhant2001 d38e08c
vuln fix
siddhant2001 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 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
119 changes: 119 additions & 0 deletions
119
...vice-impl/src/main/java/org/hypertrace/core/query/service/HandlerScopedMaskingConfig.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package org.hypertrace.core.query.service; | ||
|
|
||
| import com.typesafe.config.Config; | ||
| import java.time.Instant; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import lombok.Value; | ||
| import lombok.experimental.NonFinal; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| public class HandlerScopedMaskingConfig { | ||
| private static final String TENANT_SCOPED_MASKS_CONFIG_KEY = "tenantScopedMaskingConfig"; | ||
| private Map<String, List<TimeRangeToMaskedAttributes>> tenantToTimeRangeMaskedAttributes = | ||
| Collections.emptyMap(); | ||
|
|
||
| public HandlerScopedMaskingConfig(Config config) { | ||
| if (config.hasPath(TENANT_SCOPED_MASKS_CONFIG_KEY)) { | ||
| this.tenantToTimeRangeMaskedAttributes = | ||
| config.getConfigList(TENANT_SCOPED_MASKS_CONFIG_KEY).stream() | ||
| .map(TenantMaskingConfig::new) | ||
| .collect( | ||
| Collectors.toMap( | ||
| TenantMaskingConfig::getTenantId, | ||
| TenantMaskingConfig::getTimeRangeToMaskedAttributes)); | ||
| } | ||
| } | ||
|
|
||
| public Set<String> getMaskedAttributes(ExecutionContext executionContext) { | ||
| String tenantId = executionContext.getTenantId(); | ||
| HashSet<String> maskedAttributes = new HashSet<>(); | ||
| if (!tenantToTimeRangeMaskedAttributes.containsKey(tenantId)) { | ||
| return maskedAttributes; | ||
| } | ||
|
|
||
| Optional<QueryTimeRange> queryTimeRange = executionContext.getQueryTimeRange(); | ||
| Instant queryStartTime = Instant.MIN, queryEndTime = Instant.MAX; | ||
| if (queryTimeRange.isPresent()) { | ||
| queryStartTime = queryTimeRange.get().getStartTime(); | ||
| queryEndTime = queryTimeRange.get().getEndTime(); | ||
| } | ||
| for (TimeRangeToMaskedAttributes timeRangeAndMasks : | ||
| tenantToTimeRangeMaskedAttributes.get(tenantId)) { | ||
| if (isTimeRangeOverlap(timeRangeAndMasks, queryStartTime, queryEndTime)) { | ||
| maskedAttributes.addAll(timeRangeAndMasks.maskedAttributes); | ||
| } | ||
| } | ||
| return maskedAttributes; | ||
| } | ||
|
|
||
| private static boolean isTimeRangeOverlap( | ||
| TimeRangeToMaskedAttributes timeRangeAndMasks, Instant queryStartTime, Instant queryEndTime) { | ||
| return !(timeRangeAndMasks.startTimeMillis.isAfter(queryEndTime) | ||
| || timeRangeAndMasks.endTimeMillis.isBefore(queryStartTime)); | ||
| } | ||
|
|
||
| @Value | ||
| @NonFinal | ||
| static class TenantMaskingConfig { | ||
| private static final String TENANT_ID_CONFIG_KEY = "tenantId"; | ||
| private static final String TIME_RANGE_AND_MASK_VALUES_CONFIG_KEY = | ||
| "timeRangeToMaskedAttributes"; | ||
| String tenantId; | ||
| List<TimeRangeToMaskedAttributes> timeRangeToMaskedAttributes; | ||
|
|
||
| private TenantMaskingConfig(Config config) { | ||
| this.tenantId = config.getString(TENANT_ID_CONFIG_KEY); | ||
| this.timeRangeToMaskedAttributes = | ||
| config.getConfigList(TIME_RANGE_AND_MASK_VALUES_CONFIG_KEY).stream() | ||
| .map(TimeRangeToMaskedAttributes::new) | ||
| .filter( | ||
| timeRangeToMaskedAttributes -> { | ||
| if (!timeRangeToMaskedAttributes.isValid()) { | ||
| log.warn( | ||
| "Invalid masking configuration for tenant: {}. Either the time range is missing or the mask list is empty.", | ||
| this.tenantId); | ||
| return false; | ||
| } | ||
| return true; | ||
| }) | ||
| .collect(Collectors.toList()); | ||
| } | ||
| } | ||
|
|
||
| @NonFinal | ||
| static class TimeRangeToMaskedAttributes { | ||
| private static final String START_TIME_CONFIG_PATH = "startTimeMillis"; | ||
| private static final String END_TIME_CONFIG_PATH = "endTimeMillis"; | ||
| private static final String MASK_ATTRIBUTES_CONFIG_PATH = "maskedAttributes"; | ||
| Instant startTimeMillis = null; | ||
| Instant endTimeMillis = null; | ||
| ArrayList<String> maskedAttributes = new ArrayList<>(); | ||
|
|
||
| private TimeRangeToMaskedAttributes(Config config) { | ||
| if (config.hasPath(START_TIME_CONFIG_PATH) && config.hasPath(END_TIME_CONFIG_PATH)) { | ||
| Instant startTimeMillis = Instant.ofEpochMilli(config.getLong(START_TIME_CONFIG_PATH)); | ||
| Instant endTimeMillis = Instant.ofEpochMilli(config.getLong(END_TIME_CONFIG_PATH)); | ||
|
|
||
| if (startTimeMillis.isBefore(endTimeMillis)) { | ||
| this.startTimeMillis = startTimeMillis; | ||
| this.endTimeMillis = endTimeMillis; | ||
| if (config.hasPath(MASK_ATTRIBUTES_CONFIG_PATH)) { | ||
| maskedAttributes = new ArrayList<>(config.getStringList(MASK_ATTRIBUTES_CONFIG_PATH)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| boolean isValid() { | ||
| return startTimeMillis != null && endTimeMillis != null && !maskedAttributes.isEmpty(); | ||
| } | ||
| } | ||
| } |
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
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
Oops, something went wrong.
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.
nit: Lets see if we can use Optional as return type.