Skip to content

Sync changes from zaproxy#515

Merged
psiinon merged 1 commit into
zaproxy:mainfrom
kingthorin:docker-sync
May 29, 2026
Merged

Sync changes from zaproxy#515
psiinon merged 1 commit into
zaproxy:mainfrom
kingthorin:docker-sync

Conversation

@kingthorin
Copy link
Copy Markdown
Member

@kingthorin kingthorin commented May 28, 2026

Per: zaproxy/zaproxy#9275 and zaproxy/zaproxy#9273

@psiinon
Copy link
Copy Markdown
Member

psiinon commented May 28, 2026

Logo
Checkmarx One – Scan Summary & Details847160ac-0bce-417d-9d34-6dc03199d754

Great job! No new security vulnerabilities introduced in this pull request


Use @Checkmarx to interact with Checkmarx PR Assistant.
Examples:
@Checkmarx how are you able to help me?
@Checkmarx rescan this PR

@thc202
Copy link
Copy Markdown
Member

thc202 commented May 28, 2026

Isn't this syncing? It would be easier to follow the history if it stated (PR/commit) this is just a sync from the main repo.

@kingthorin
Copy link
Copy Markdown
Member Author

Sure

@kingthorin kingthorin changed the title Fix duplicate alert references in HTTP Response Code Errors script Sync from zaproxy May 28, 2026
@kingthorin kingthorin force-pushed the docker-sync branch 2 times, most recently from 220554c to e41b625 Compare May 28, 2026 10:50
@kingthorin kingthorin requested a review from Copilot May 28, 2026 11:57
@thc202
Copy link
Copy Markdown
Member

thc202 commented May 28, 2026

They don't seem to be properly synced, which zaproxy commit was used for the sync?

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Synchronizes the HTTP Sender “Alert on HTTP Response Code Errors” script with upstream ZAP changes (per zaproxy/zaproxy#9275 and zaproxy/zaproxy#9273), aiming to better identify distinct alert variants.

Changes:

  • Add alertRef differentiation for 4xx vs 5xx alerts and set Alert#setAlertRef(...) accordingly.
  • Update CHANGELOG.md with an entry noting the upstream sync.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
httpsender/Alert on HTTP Response Code Errors.js Adds alertRef variant and sets alert.setAlertRef(...) for clearer alert identification.
CHANGELOG.md Documents the upstream sync in the Unreleased section.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread CHANGELOG.md Outdated
@@ -95,6 +97,7 @@ function responseReceived(msg, initiator, helper) {
"Raised by the 'Alert on HTTP Response Code Error' script"
@kingthorin
Copy link
Copy Markdown
Member Author

kingthorin commented May 28, 2026

I didn't do a file copy the formatting and semicolons are different. I just inserted the three lines. In the zaproxy PR which introduced these changes one line was setting ref before title the other was after title, I made that consistent.

@kingthorin kingthorin changed the title Sync from zaproxy Sync changes from zaproxy May 28, 2026
@thc202
Copy link
Copy Markdown
Member

thc202 commented May 28, 2026

I'd suggest copy them (spotless would remove any formatting differences), there are differences that should be applied regardless (don't mind the title swap). Also, please include the commit hash in the commit message for future reference/tracking.

@kingthorin kingthorin force-pushed the docker-sync branch 2 times, most recently from 586d0f4 to 37b600b Compare May 28, 2026 12:45
- AlertOnHttpResponseCodeErrors.js : Based on zaproxy f6f3ebe6de5e34d043732e92be5c6410b29b6a36
- AlertOnUnexpectedContentTypes.js : Based on zaproxy ffe308dce7d613ffc30ebbb736de4873d143b3b4

Signed-off-by: kingthorin <kingthorin@users.noreply.github.com>
@thc202
Copy link
Copy Markdown
Member

thc202 commented May 28, 2026

Thank you!

@psiinon psiinon merged commit 192dcf4 into zaproxy:main May 29, 2026
9 checks passed
@kingthorin kingthorin deleted the docker-sync branch May 29, 2026 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants