Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wiremock/wiremock
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.35.0
Choose a base ref
...
head repository: wiremock/wiremock
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.35.1
Choose a head ref
  • 14 commits
  • 25 files changed
  • 3 contributors

Commits on Sep 5, 2023

  1. Closes #2007 - added support for preventing proxying to certain addre… 

    …sses via allow/deny lists

(cherry picked from commit 5d0a056)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    3c63aaa View commit details
    Browse the repository at this point in the history

  2. Simplified IP address range regex in NetworkAddressRange 

    (cherry picked from commit ac079cf)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    40ec430 View commit details
    Browse the repository at this point in the history

  3. Removed some duplicated defaulting logic for configuring proxy target… 

    … rules from the command line

(cherry picked from commit 0e42c14)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f490f93 View commit details
    Browse the repository at this point in the history

  4. Added equals() and hashCode() to NetworkAddressRange 

    (cherry picked from commit 483d937)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    18d972a View commit details
    Browse the repository at this point in the history

  5. Added some extra NetworkAddressRules test cases 

    (cherry picked from commit 355c53d)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    295ad5c View commit details
    Browse the repository at this point in the history

  6. Fixed some formatting in NetworkAddressRulesTest 

    (cherry picked from commit 91353df)
    @Mahoney
    Tom Akehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    5412ed1 View commit details
    Browse the repository at this point in the history

  7. spotless apply

    @Mahoney
    Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    ef5b722 View commit details
    Browse the repository at this point in the history

  8. Rename poorly named method 

    It doesn't build a client, it chooses one

(cherry picked from commit 9105b56)
    @Mahoney
    Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9ba86d6 View commit details
    Browse the repository at this point in the history

  9. Prevent webhook calling forbidden endpoints 

    Allows configuring network address rules to permit / deny webhook usage.

(cherry picked from commit 14ac072)
    @Mahoney
    Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    eac439f View commit details
    Browse the repository at this point in the history

  10. Moved enforcement of network address rules to Apache client DNS resol… 

    …ver to avoid race condition where rules can be bypassed via successive lookups returning different IP addresses
    @tomakehurst @Mahoney
    tomakehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    d9fd0b4 View commit details
    Browse the repository at this point in the history

  11. Applied DNS resolver enforcement to webhooks extension

    @tomakehurst @Mahoney
    tomakehurst authored and Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    90a37e1 View commit details
    Browse the repository at this point in the history

  12. Make NetworkAddressRulesAdheringDnsResolver testable 

    By using composition rather than inheritance
    @Mahoney
    Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    aa29d9c View commit details
    Browse the repository at this point in the history

  13. Stop NetworkAddressRules doing DNS lookups 

    By distinguishing between DomainNameWildcard rules and IP based rules
    @Mahoney
    Mahoney committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    20adc25 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Bumped patch version

    @tomakehurst
    tomakehurst committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    8706343 View commit details
    Browse the repository at this point in the history
Loading