Include more info when webhook refusal logged

Otherwise, there's no context to trace it back to a stub

Author: Mahoney

src/main/java/org/wiremock/webhooks/Webhooks.java

@@ -18,6 +18,7 @@
 import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.github.tomakehurst.wiremock.common.NetworkAddressRules;
@@ -48,6 +49,7 @@
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
 
+@SuppressWarnings("deprecation") // maintaining PostServeAction for backwards compatibility
 public class Webhooks extends PostServeAction implements ServeEventListener {
 
  private final ScheduledExecutorService scheduler;
@@ -79,6 +81,7 @@ public Webhooks() {
  this(NetworkAddressRules.ALLOW_ALL);
  }
 
+ @SuppressWarnings("unused") // public API
  public Webhooks(WebhookTransformer... transformers) {
  this(Arrays.asList(transformers), NetworkAddressRules.ALLOW_ALL);
  }
@@ -149,7 +152,14 @@ private void triggerWebhook(ServeEvent serveEvent, Parameters parameters) {
  response.getCode(),
  EntityUtils.toString(response.getEntity())));
  } catch (ProhibitedNetworkAddressException e) {
- notifier.error("The target webhook address is denied in WireMock's configuration.");
+ notifier.error(
+ String.format(
+ "The target webhook address %s specified by stub %s is denied in WireMock's configuration.",
+ finalDefinition.getUrl(),
+ firstNonNull(
+ serveEvent.getStubMapping().getName(),
+ serveEvent.getStubMapping().getId(),
+ "<no name or id>")));
  } catch (Exception e) {
  notifier.error(
  String.format(

src/test/java/com/github/tomakehurst/wiremock/WebhooksAcceptanceViaPostServeActionTest.java

@@ -38,6 +38,7 @@
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.testsupport.CompositeNotifier;
 import com.github.tomakehurst.wiremock.testsupport.TestNotifier;
 import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;
@@ -365,17 +366,18 @@ public void addsRandomDelayViaJSON() throws Exception {
 
  @Test
  public void doesNotFireAWebhookWhenRequestedForDeniedTarget() throws Exception {
- rule.stubFor(
- post(urlPathEqualTo("/webhook"))
- .willReturn(aResponse().withStatus(200))
- .withPostServeAction(
- "webhook",
- webhook()
- .withMethod(POST)
- .withUrl("http://169.254.2.34/foo")
- .withHeader("Content-Type", "application/json")
- .withHeader("X-Multi", "one", "two")
- .withBody("{ \"result\": \"SUCCESS\" }")));
+ StubMapping stub =
+ rule.stubFor(
+ post(urlPathEqualTo("/webhook"))
+ .willReturn(aResponse().withStatus(200))
+ .withPostServeAction(
+ "webhook",
+ webhook()
+ .withMethod(POST)
+ .withUrl("http://169.254.2.34/foo")
+ .withHeader("Content-Type", "application/json")
+ .withHeader("X-Multi", "one", "two")
+ .withBody("{ \"result\": \"SUCCESS\" }")));
 
  client.post("/webhook", new StringEntity("", TEXT_PLAIN));
 
@@ -389,7 +391,10 @@ public void doesNotFireAWebhookWhenRequestedForDeniedTarget() throws Exception {
  await().until(() -> testNotifier.getErrorMessages(), hasSize(greaterThanOrEqualTo(1)));
  assertThat(
  errorMessages.get(0),
- is("The target webhook address is denied in WireMock's configuration."));
+ is(
+ "The target webhook address http://169.254.2.34/foo specified by stub "
+ + stub.getId()
+ + " is denied in WireMock's configuration."));
  }
 
  private void waitForRequestToTargetServer() throws Exception {

src/test/java/com/github/tomakehurst/wiremock/WebhooksAcceptanceViaServeEventTest.java

@@ -38,6 +38,7 @@
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.testsupport.CompositeNotifier;
 import com.github.tomakehurst.wiremock.testsupport.TestNotifier;
 import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;
@@ -374,17 +375,18 @@ public void addsRandomDelayViaJSON() throws Exception {
 
  @Test
  public void doesNotFireAWebhookWhenRequestedForDeniedTarget() throws Exception {
- rule.stubFor(
- post(urlPathEqualTo("/webhook"))
- .willReturn(aResponse().withStatus(200))
- .withServeEventListener(
- "webhook",
- webhook()
- .withMethod(POST)
- .withUrl("http://169.254.2.34/foo")
- .withHeader("Content-Type", "application/json")
- .withHeader("X-Multi", "one", "two")
- .withBody("{ \"result\": \"SUCCESS\" }")));
+ StubMapping stub =
+ rule.stubFor(
+ post(urlPathEqualTo("/webhook"))
+ .willReturn(aResponse().withStatus(200))
+ .withServeEventListener(
+ "webhook",
+ webhook()
+ .withMethod(POST)
+ .withUrl("http://169.254.2.34/foo")
+ .withHeader("Content-Type", "application/json")
+ .withHeader("X-Multi", "one", "two")
+ .withBody("{ \"result\": \"SUCCESS\" }")));
 
  client.post("/webhook", new StringEntity("", TEXT_PLAIN));
 
@@ -398,7 +400,10 @@ public void doesNotFireAWebhookWhenRequestedForDeniedTarget() throws Exception {
  await().until(() -> testNotifier.getErrorMessages(), hasSize(greaterThanOrEqualTo(1)));
  assertThat(
  errorMessages.get(0),
- is("The target webhook address is denied in WireMock's configuration."));
+ is(
+ "The target webhook address http://169.254.2.34/foo specified by stub "
+ + stub.getId()
+ + " is denied in WireMock's configuration."));
  }
 
  private void waitForRequestToTargetServer() throws Exception {