Skip to content
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

Proposed fix for issue #1145 #1149

Merged
merged 2 commits into from
Apr 8, 2018

Conversation

aikebah
Copy link
Collaborator

@aikebah aikebah commented Mar 25, 2018

Fixes Issue #1145

Description of Change

  • Implemented single-pass multi-xml-schema-validating parser similar to existing code for hints parsing
  • Added new suppression xmlschema version with the 'until' for a suppression rule implemented as attribute of suppress (which seems more logical to me than a child element)
  • updated code to support this temporary suppression of issues
  • Added testcases for the proper parsing of the version 1.1 (existing) and 1.2 (new) suppressionfile xmlschema

Have test cases been added to cover the new functionality?

yes (validating that suppressions with until 'in-the-past' do not appear in the suppression-rules and suppressions without until and with until 'in-the-future' do appear in the suppression-rules after parsing)

@aikebah
Copy link
Collaborator Author

aikebah commented Apr 2, 2018

@jeremylong Let me know if you'd rather have a PR from a rebased version to pass the travis-ci build (with a proper NVD datafeed configuration)

@jeremylong
Copy link
Owner

@aikebah if you wouldn't mind rebasing this - I would appreciate it.

Thanks!

@aikebah aikebah force-pushed the upstream-issue-1145 branch from 2b4b4ad to 53bc461 Compare April 8, 2018 21:05
@aikebah
Copy link
Collaborator Author

aikebah commented Apr 8, 2018

branch rebased to current master

@aikebah aikebah force-pushed the upstream-issue-1145 branch from 53bc461 to 518b66b Compare April 8, 2018 21:11
@jeremylong jeremylong merged commit 7adce45 into jeremylong:master Apr 8, 2018
@aikebah aikebah deleted the upstream-issue-1145 branch April 8, 2018 22:39
@aikebah aikebah restored the upstream-issue-1145 branch April 12, 2018 20:56
@aikebah aikebah deleted the upstream-issue-1145 branch April 12, 2018 21:00
@lock lock bot locked and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants