HPCC-32847 Require WsLogAccess to include logs in ZAP #19389
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
Require the same WsLogAccess:READ permission to include log files in a ZAP as would be required to view them. When log files are excluded from the ZAP due to lack of permission, the ZAP info file (<wuid>.txt) includes a line explaining their absence. Signed-off-by: Terrence Asselin <[email protected]>
|
Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32847 Jirabot Action Result: |
rpastrana
reviewed
Jan 10, 2025
| writeZAPWUInfoToIOStream(outFile, "Timing: ", request.whereSlow); | ||
| if (request.logsExcludedDueToNoAccess()) | ||
| { | ||
| writeZAPWUInfoToIOStream(outFile, "Logs: ", "Excluded due to no access, need WsLogAccess:Read"); |
There was a problem hiding this comment.
Very minor, but potentially very helpful would be to add "user lacks 'WsLogAccess:Read' feature access, please contact admin" or something to that affect.
| @@ -4563,6 +4573,9 @@ void CWsWuFileHelper::createZAPWUQueryAssociatedFiles(IConstWorkUnit* cwu, const | |||
| cur.getName(name); | |||
| cur.getIp(ip); | |||
|
|
|||
| if (!hasLogsAccess && endsWith(name.str(), ".eclcc.log")) | |||
There was a problem hiding this comment.
I'm not sure I follow what's special about *.eclcc.log files, this might need a code comment
| @@ -381,6 +382,17 @@ struct CWsWuZAPInfoReq | |||
| { | |||
| logFilter.populateLogFilter(wuid.str(), httpRequest); | |||
| } | |||
|
|
|||
| // True when logs _would have been included_ if the user had access | |||
| bool logsExcludedDueToNoAccess() | |||
There was a problem hiding this comment.
minor, but for some reason the current method name misleads me into thinking the logs have already been excluded, but I think the method is determining if the logs should be excluded, does it make sense to rename to excludeLogsDueToNoAccess()?
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.
Require the same WsLogAccess:READ permission to include log files in a ZAP as would be required to view them. When log files are excluded from the ZAP due to lack of permission, the ZAP info file (.txt) includes a line explaining their absence.
Type of change:
Checklist:
Smoketest:
Testing:
Tested manually on laptop both bare metal and containerized deployments. Checked cases with and without access both requesting and not requesting logs.