-
-
Notifications
You must be signed in to change notification settings - Fork 27
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
Support JSON Output #104
Draft
eliasm307
wants to merge
1
commit into
jeemok:master
Choose a base branch
from
eliasm307:feat/support-json-output
base: master
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
Support JSON Output #104
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
}, | ||
"scripts": { | ||
"preaudit": "npm run build", | ||
"audit": "node lib audit -x 1064843,1067245", | ||
"audit": "node lib audit -j -x 1064843,1067245", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. temporary for testing |
||
"test": "mocha -r ts-node/register test/**/*.test.ts", | ||
"lint": "eslint .", | ||
"qc": "npm run test && npm run lint", | ||
|
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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import { AuditLevel } from 'src/types'; | ||
import { printSecurityReport } from '../utils/print'; | ||
import { printJsonOutput, printSecurityReport } from '../utils/print'; | ||
import { processAuditJson, handleUnusedExceptions } from '../utils/vulnerability'; | ||
|
||
/** | ||
|
@@ -9,21 +9,20 @@ import { processAuditJson, handleUnusedExceptions } from '../utils/vulnerability | |
* @param {Array} exceptionIds List of vulnerability IDs to exclude | ||
* @param {Array} exceptionModules List of vulnerable modules to ignore in audit results | ||
* @param {Array} columnsToInclude List of columns to include in audit results | ||
* @param {Boolean} outputJson Output audit report in JSON format | ||
* @param {Array} exceptionsReport List of exceptions | ||
*/ | ||
export default function handleFinish( | ||
jsonBuffer: string, | ||
auditLevel: AuditLevel, | ||
exceptionIds: string[], | ||
exceptionModules: string[], | ||
columnsToInclude: string[], | ||
outputJson: boolean, | ||
exceptionsReport: string[][], | ||
): void { | ||
const { unhandledIds, report, failed, unusedExceptionIds, unusedExceptionModules } = processAuditJson( | ||
jsonBuffer, | ||
auditLevel, | ||
exceptionIds, | ||
exceptionModules, | ||
columnsToInclude, | ||
); | ||
const result = processAuditJson(jsonBuffer, auditLevel, exceptionIds, exceptionModules, columnsToInclude, outputJson); | ||
const { unhandledIds, report, failed, unusedExceptionIds, unusedExceptionModules } = result; | ||
|
||
// If unable to process the audit JSON | ||
if (failed) { | ||
|
@@ -34,21 +33,31 @@ export default function handleFinish( | |
} | ||
|
||
// Print the security report | ||
if (report.length) { | ||
printSecurityReport(report, columnsToInclude); | ||
} | ||
if (outputJson) { | ||
printJsonOutput(result, exceptionsReport); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. with json output we only print the json, any other logs should be suppressed so the output can be parsed as json |
||
} else { | ||
if (report.length) { | ||
printSecurityReport(report, columnsToInclude); | ||
} | ||
|
||
// Handle unused exceptions | ||
handleUnusedExceptions(unusedExceptionIds, unusedExceptionModules); | ||
// Handle unused exceptions | ||
handleUnusedExceptions(unusedExceptionIds, unusedExceptionModules); | ||
} | ||
|
||
// Display the found unhandled vulnerabilities | ||
if (unhandledIds.length) { | ||
console.error(`${unhandledIds.length} vulnerabilities found. Node security advisories: ${unhandledIds.join(', ')}`); | ||
if (!outputJson) { | ||
console.error(`${unhandledIds.length} vulnerabilities found. Node security advisories: ${unhandledIds.join(', ')}`); | ||
} | ||
|
||
// Exit failed | ||
process.exit(1); | ||
} else { | ||
// Happy happy, joy joy | ||
console.info('🤝 All good!'); | ||
if (!outputJson) { | ||
console.info('🤝 All good!'); | ||
} | ||
|
||
process.exit(0); | ||
} | ||
} |
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
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 |
---|---|---|
@@ -1,2 +1,8 @@ | ||
/** Display names for table columns */ | ||
export type SecurityReportHeader = 'ID' | 'Module' | 'Title' | 'Paths' | 'Severity' | 'URL' | 'Ex.'; | ||
/** Names for object properties */ | ||
export type SecurityReportKey = 'id' | 'module' | 'title' | 'paths' | 'severity' | 'url' | 'isExcepted'; | ||
/** Display names for table columns */ | ||
export type ExceptionReportHeader = 'ID' | 'Status' | 'Expiry' | 'Notes'; | ||
/** Names for object properties */ | ||
export type ExceptionReportKey = 'id' | 'status' | 'expiry' | 'notes'; |
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.
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.
is there a reason functions dont use a single object argument? This could be neater but I noticed all other functions provide individual args like this?