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

Clam 2586 save urls html #1281

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

ragusaa
Copy link
Contributor

@ragusaa ragusaa commented Jun 18, 2024

No description provided.

@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch from 638344d to 73a2786 Compare June 18, 2024 15:50
libclamav/scanners.c Outdated Show resolved Hide resolved
@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch 3 times, most recently from 685401d to 44832fc Compare June 25, 2024 18:08
@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch 4 times, most recently from 7243032 to 5ea9ec7 Compare July 10, 2024 22:08
Copy link
Contributor

@micahsnyder micahsnyder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm done with code review part. Time to do some testing.

libclamav/clamav.h Outdated Show resolved Hide resolved
libclamav/others.h Outdated Show resolved Hide resolved
libclamav/scanners.c Outdated Show resolved Hide resolved
libclamav/scanners.c Outdated Show resolved Hide resolved
libclamav/scanners.c Outdated Show resolved Hide resolved
libclamav/scanners.c Outdated Show resolved Hide resolved
unit_tests/clamscan/save_html_urls_test.py Outdated Show resolved Hide resolved
clamscan/clamscan.c Outdated Show resolved Hide resolved
common/optparser.c Outdated Show resolved Hide resolved
@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch 2 times, most recently from d6705c7 to 113412e Compare July 18, 2024 18:37
common/optparser.c Show resolved Hide resolved
libclamav/clamav.h Outdated Show resolved Hide resolved
libclamav/scanners.c Outdated Show resolved Hide resolved
@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch from f8c043a to 2c9abc4 Compare July 18, 2024 20:54
@ragusaa ragusaa requested a review from micahsnyder July 18, 2024 20:54
clamscan/clamscan.c Outdated Show resolved Hide resolved
@ragusaa ragusaa force-pushed the CLAM-2586-SaveUrlsHTML branch from eba2c5d to 44aa119 Compare July 19, 2024 19:52
micahsnyder
micahsnyder previously approved these changes Jul 19, 2024
Copy link
Contributor

@micahsnyder micahsnyder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great.

I also did some manual testing with a small selection of HTML files. That went well.

Approving for inclusion in 1.5.0

Store URLs found in HTML `<a>` and `<form>` tags during scan of HTML files
when recording scan metadata.

HTML URL recording will be ON by default, but is a part of the
generate-metadata-json feature.
The generate-metadata-json feature is OFF by default.

This introduces a new general scan option:
- libclamav: `CL_SCAN_GENERAL_STORE_HTML_URLS`.
- ClamD: `JsonStoreHTMLUrls`.
- ClamScan: `--json-store-html-urls`

Thank you Matt Jolly for the helpful comment on the pull request.
@micahsnyder
Copy link
Contributor

Rebased and removed the temporary function from the TODO. Ready to test and hopefully merge.

@micahsnyder micahsnyder merged commit 03d0481 into Cisco-Talos:main Sep 12, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants