zaproxy-website icon indicating copy to clipboard operation
zaproxy-website copied to clipboard

blog: Add PortSwigger lab walkthrough (Broken brute-force protection, IP block)

Open Wryhder opened this issue 9 months ago • 14 comments

@kingthorin I tried to add callouts/admonitions (called alerts in the Hugo docs) like this to match the look in the Notion doc, but it doesn't seem to work:

> [!NOTE]
> Useful information that users should know, even when skimming content.

Can I add a template for alerts as shown in the docs here?

Wryhder avatar Feb 17 '25 16:02 Wryhder

Logo Checkmarx One – Scan Summary & Details63d47ee5-1de3-4037-84ae-564fb9a3b40c

Great job, no security vulnerabilities found in this Pull Request

psiinon avatar Feb 17 '25 16:02 psiinon

I'm fine with that being added.

@psiinon, @thc202 do we want those in a separate PR then rebase the blog on top after accepted/merged??

kingthorin avatar Feb 17 '25 17:02 kingthorin

Leaving a comment here about force-pushed changes. I added the sign-off trailer.

EDIT: @kingthorin I don't remember being prompted to sign the CLA when I created this PR. Do I need to create a PR to the CLA repo?

Wryhder avatar Feb 20 '25 18:02 Wryhder

Nope you're good, CLA isn't enabled for this repo. Thanks for checking though.

kingthorin avatar Feb 20 '25 18:02 kingthorin

@kingthorin I was working through a different lab and realized I got some details in this walkthrough mixed up with details from another lab. I'll correct the inaccuracies and let you know when this is ready for review again.

Wryhder avatar Feb 21 '25 16:02 Wryhder

Thanks for the heads up. I hadn't gone to look at the lab at all, so we easily could have missed that.....

kingthorin avatar Feb 21 '25 17:02 kingthorin

Thanks for this! As you've probably noticed we've got another Portswigger lab PR outstanding #2973 so we'll aim to get that one published first and then focus on this one 😁

psiinon avatar Feb 26 '25 17:02 psiinon

This can be rebased now

kingthorin avatar Mar 23 '25 08:03 kingthorin

I'll try to do a thorough review of the text and details over the next few days.

Alright, thank you!

Wryhder avatar Mar 28 '25 02:03 Wryhder

To address the DCO requirement you'll need to sign-off the commit(s):

  • https://github.com/zaproxy/zaproxy/blob/main/CONTRIBUTING.md#developer-certificate-of-origin
  • https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff

Handle this how you like, but I find it's easiest to collapse all the commits into one and just do the signoff on that one.

kingthorin avatar Mar 31 '25 10:03 kingthorin

@kingthorin I've read through your comments (left replies on some). I'll address them within the next few days. Thanks for being so thorough with your review. Appreciate it!

Wryhder avatar Mar 31 '25 12:03 Wryhder

No problem at all, thanks for tackling this!

kingthorin avatar Mar 31 '25 13:03 kingthorin

@kingthorin I've implemented all feedback from your review. Also fixed the DCO issue (I had the trailer in the previous commits but was modifying it manually and it ended up being invalid).

Didn't squash commits because I wanted to keep the history (initial article vs current one).

Wryhder avatar Apr 02 '25 02:04 Wryhder

Assuming that one filename/reference thing is addressed I'm good with this article now.

kingthorin avatar Apr 03 '25 12:04 kingthorin

@kingthorin I've made the filename change. Also squashed a few commits.

Wryhder avatar Apr 03 '25 19:04 Wryhder

Force-pushed change is more squashing. Done now.

Wryhder avatar Apr 03 '25 19:04 Wryhder

@kingthorin My apologies. Missed a couple of spots.

Wryhder avatar Apr 04 '25 07:04 Wryhder

I've updated the date to today and made some minor tweaks to address @thc202's feedback

psiinon avatar Apr 09 '25 10:04 psiinon

Thank you both!

thc202 avatar Apr 09 '25 10:04 thc202

Thanks @Wryhder and sorry this took so long to get published. Its now live on https://www.zaproxy.org/blog/2025-04-09-portswigger-labs-broken-brute-force-protection-ip-block/ and shared via the usual social media sites 😁

psiinon avatar Apr 09 '25 11:04 psiinon

Thanks @Wryhder !!

kingthorin avatar Apr 09 '25 12:04 kingthorin

@thc202 Thanks a bunch for your review.

Thanks @psiinon for making the changes. Article looks good, thank you! I'll repost.

And thanks again @kingthorin for your help with this.

Wryhder avatar Apr 09 '25 12:04 Wryhder