Skip to content

uri regex fix #617

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

uri regex fix #617

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06f483b
uri regex fix
TomConner May 23, 2025
e4063c9
remove debug print
TomConner May 23, 2025
2d1c2ca
Merge branch 'master' into tc-DSEC-958-uri-regex-2
TomConner May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions zap/src/scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
Runs ZAP scan, uploads results to Code Dx and GCS, and alerts Slack.
"""

import csv
import logging
import os
import re
import csv
from datetime import datetime, timedelta
from enum import Enum
from os import getenv
Expand Down Expand Up @@ -359,20 +359,30 @@ def slack_alert_without_report( # pylint: disable=too-many-arguments
logging.info("Alert sent to Slack channel for DefectDojo upload report")

# match a hash after a hyphen or dot, and only match 8 or 9 characters of hex
URI_HASH_REGEX = re.compile(r"[-\.][a-zA-Z0-9]{8,9}(?![a-fA-F0-9])")
URI_HASH_REGEX1 = re.compile(r"[-\.][a-zA-Z0-9]{8,9}(?![a-fA-F0-9])")
REPLACEMENT1 = ""
# remote a hash e.g. /assets/index-4au49BA-.js -> /assets/index.js
URI_HASH_REGEX2 = re.compile(r"index-\w{7}-\.js")
REPLACEMENT2 = "index.js"


def clean_uri_path(xml_report):
"""
Remove the changing hash from the path of static resources in zap report.
"""
tree = ET.parse(xml_report)
root = tree.getroot()
#There's a hash in bundled files that is causing flaws to not match
# There's a hash in bundled files that is causing flaws to not match
# this should remove the hash.
for uri in root.iter('uri'):
r=urlparse(uri.text)
r=r._replace(path=URI_HASH_REGEX.sub('', r.path))
uri.text = urlunparse(r)
for uri in root.iter("uri"):
r = urlparse(uri.text)
print(type(r))
path_old = r.path
r = r._replace(path=URI_HASH_REGEX1.sub(REPLACEMENT1, r.path))
r = r._replace(path=URI_HASH_REGEX2.sub(REPLACEMENT2, r.path))
if r.path != path_old:
logging.info("URI %s -> %s", path_old, r.path)
uri.text = urlunparse(r)
tree.write(xml_report)

def get_codedx_findings_json(cdx,codedx_project):
Expand Down