-
Notifications
You must be signed in to change notification settings - Fork 5
[WIP] AuditV2 and AuditV3 Logging Formatting
#848
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
Draft
bmarcaur
wants to merge
1
commit into
develop
Choose a base branch
from
bmarcaurele/audit-log-sls-formatting
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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 hidden or 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,10 @@ | ||
| { | ||
| "permissions": { | ||
| "allow": [ | ||
| "Bash(find:*)", | ||
| "WebFetch(domain:github.com)" | ||
| ], | ||
| "deny": [], | ||
| "ask": [] | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
56 changes: 56 additions & 0 deletions
56
...atting/src/main/java/com/palantir/witchcraft/java/logging/format/AuditLogV2Formatter.java
This file contains hidden or 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,56 @@ | ||
| /* | ||
| * (c) Copyright 2021 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.witchcraft.java.logging.format; | ||
|
|
||
| import com.palantir.witchcraft.api.logging.AuditLogV2; | ||
| import java.time.format.DateTimeFormatter; | ||
|
|
||
| final class AuditLogV2Formatter { | ||
| private AuditLogV2Formatter() {} | ||
|
|
||
| static String format(AuditLogV2 audit) { | ||
| return Formatting.withStringBuilder(buffer -> { | ||
| buffer.append('['); | ||
| DateTimeFormatter.ISO_INSTANT.formatTo(audit.getTime(), buffer); | ||
| buffer.append("] AUDIT: ").append(audit.getName()).append(' ').append(audit.getResult()); | ||
|
|
||
| // Optional fields | ||
| audit.getUid().ifPresent(uid -> buffer.append(" uid: ").append(uid)); | ||
| audit.getSid().ifPresent(sid -> buffer.append(" sid: ").append(sid)); | ||
| audit.getTokenId().ifPresent(tokenId -> buffer.append(" tokenId: ").append(tokenId)); | ||
| audit.getOrgId().ifPresent(orgId -> buffer.append(" orgId: ").append(orgId)); | ||
| audit.getTraceId().ifPresent(traceId -> buffer.append(" traceId: ").append(traceId)); | ||
| audit.getOrigin().ifPresent(origin -> buffer.append(" origin: ").append(origin)); | ||
|
|
||
| if (!audit.getOtherUids().isEmpty()) { | ||
| buffer.append(" otherUids: ").append(audit.getOtherUids()); | ||
| } | ||
|
|
||
| if (!audit.getRequestParams().isEmpty()) { | ||
| buffer.append("\n requestParams: ") | ||
| .append(Formatting.prettyPrintJson(audit.getRequestParams()) | ||
| .replace("\n", "\n ")); | ||
| } | ||
|
|
||
| if (!audit.getResultParams().isEmpty()) { | ||
| buffer.append("\n resultParams: ") | ||
| .append(Formatting.prettyPrintJson(audit.getResultParams()) | ||
| .replace("\n", "\n ")); | ||
| } | ||
| }); | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
...atting/src/main/java/com/palantir/witchcraft/java/logging/format/AuditLogV3Formatter.java
This file contains hidden or 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,75 @@ | ||
| /* | ||
| * (c) Copyright 2021 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.witchcraft.java.logging.format; | ||
|
|
||
| import com.palantir.witchcraft.api.logging.AuditLogV3; | ||
| import java.time.format.DateTimeFormatter; | ||
|
|
||
| final class AuditLogV3Formatter { | ||
| private AuditLogV3Formatter() {} | ||
|
|
||
| static String format(AuditLogV3 audit) { | ||
| return Formatting.withStringBuilder(buffer -> { | ||
| buffer.append('['); | ||
| DateTimeFormatter.ISO_INSTANT.formatTo(audit.getTime(), buffer); | ||
| buffer.append("] AUDIT: ").append(audit.getName()).append(' ').append(audit.getResult()); | ||
|
|
||
| // Product and service info | ||
| buffer.append(" product: ").append(audit.getProduct()); | ||
| buffer.append(" productVersion: ").append(audit.getProductVersion()); | ||
| audit.getStack().ifPresent(stack -> buffer.append(" stack: ").append(stack)); | ||
| audit.getService().ifPresent(service -> buffer.append(" service: ").append(service)); | ||
| audit.getHost().ifPresent(host -> buffer.append(" host: ").append(host)); | ||
| audit.getDeployment() | ||
| .ifPresent(deployment -> buffer.append(" deployment: ").append(deployment)); | ||
| audit.getEnvironment() | ||
| .ifPresent(environment -> buffer.append(" environment: ").append(environment)); | ||
|
|
||
| // User and session info | ||
| audit.getUid().ifPresent(uid -> buffer.append(" uid: ").append(uid)); | ||
| audit.getSid().ifPresent(sid -> buffer.append(" sid: ").append(sid)); | ||
| audit.getTokenId().ifPresent(tokenId -> buffer.append(" tokenId: ").append(tokenId)); | ||
| audit.getOrgId().ifPresent(orgId -> buffer.append(" orgId: ").append(orgId)); | ||
| audit.getTraceId().ifPresent(traceId -> buffer.append(" traceId: ").append(traceId)); | ||
| audit.getOrigin().ifPresent(origin -> buffer.append(" origin: ").append(origin)); | ||
|
|
||
| // Categories | ||
| if (!audit.getCategories().isEmpty()) { | ||
| buffer.append(" categories: ").append(audit.getCategories()); | ||
| } | ||
|
|
||
| // Event and log IDs | ||
| buffer.append(" eventId: ").append(audit.getEventId()); | ||
| audit.getLogEntryId() | ||
| .ifPresent(logEntryId -> buffer.append(" logEntryId: ").append(logEntryId)); | ||
| audit.getSequenceId() | ||
| .ifPresent(sequenceId -> buffer.append(" sequenceId: ").append(sequenceId)); | ||
|
|
||
| if (!audit.getRequestFields().isEmpty()) { | ||
| buffer.append("\n requestFields: ") | ||
| .append(Formatting.prettyPrintJson(audit.getRequestFields()) | ||
| .replace("\n", "\n ")); | ||
| } | ||
|
|
||
| if (!audit.getResultFields().isEmpty()) { | ||
| buffer.append("\n resultFields: ") | ||
| .append(Formatting.prettyPrintJson(audit.getResultFields()) | ||
| .replace("\n", "\n ")); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
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.
This needs to be git ignored. Need to run the excavator on OSS.