Merge pull request #6538 from thc202/zest/client-errors

zest: fail fast on client errors

Author: psiinon

addOns/zest/CHANGELOG.md

@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
-
+### Changed
+- Fail fast on client errors.
 
 ## [48.7.0] - 2025-06-10
 ### Changed

addOns/zest/src/main/java/org/zaproxy/zap/extension/zest/ZestZapRunner.java

@@ -401,9 +401,10 @@ public String handleClient(ZestScript script, ZestClient client)
                 }
             }
             return super.handleClient(script, client);
+        } catch (ZestClientFailException e) {
+            throw e;
         } catch (Exception e) {
-            LOGGER.error(e.getMessage(), e);
-            return null;
+            throw new ZestClientFailException(client, e);
         }
     }
 

addOns/zest/src/test/java/org/zaproxy/zap/extension/zest/ZestZapRunnerUnitTest.java

@@ -0,0 +1,90 @@
+/*
+ * Zed Attack Proxy (ZAP) and its related class files.
+ *
+ * ZAP is an HTTP/HTTPS proxy for assessing web application security.
+ *
+ * Copyright 2025 The ZAP Development Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zaproxy.zap.extension.zest;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.zaproxy.addon.network.ExtensionNetwork;
+import org.zaproxy.zap.extension.script.ExtensionScript;
+import org.zaproxy.zest.core.v1.ZestClient;
+import org.zaproxy.zest.core.v1.ZestClientFailException;
+import org.zaproxy.zest.core.v1.ZestScript;
+
+/** Unit test for {@link ZestZapRunner}. */
+class ZestZapRunnerUnitTest {
+
+    private ExtensionZest extensionZest;
+    private ExtensionScript extensionScript;
+    private ExtensionNetwork extensionNetwork;
+    private ZestScriptWrapper scriptWrapper;
+
+    private ZestZapRunner runner;
+
+    @BeforeEach
+    void setup() {
+        extensionZest = mock();
+        extensionScript = mock();
+        given(extensionZest.getExtScript()).willReturn(extensionScript);
+        extensionNetwork = mock();
+        given(extensionNetwork.getMainProxyServerInfo()).willReturn(mock());
+        scriptWrapper = mock();
+
+        runner = new ZestZapRunner(extensionZest, extensionNetwork, scriptWrapper);
+    }
+
+    @Test
+    void shouldRethrowClientZestClientFailExceptions() throws ZestClientFailException {
+        // Given
+        ZestScript script = mock();
+        ZestClient client = mock();
+        ZestClientFailException exception = new ZestClientFailException(null);
+        given(client.invoke(any())).willThrow(exception);
+        // When
+        Exception thrown =
+                assertThrows(
+                        ZestClientFailException.class, () -> runner.handleClient(script, client));
+        // Then
+        assertThat(thrown, is(sameInstance(exception)));
+    }
+
+    @Test
+    void shouldThrowClientExceptions() throws ZestClientFailException {
+        // Given
+        ZestScript script = mock();
+        ZestClient client = mock();
+        RuntimeException exception = new RuntimeException();
+        given(client.invoke(any())).willThrow(exception);
+        // When
+        ZestClientFailException thrown =
+                assertThrows(
+                        ZestClientFailException.class, () -> runner.handleClient(script, client));
+        // Then
+        assertThat(thrown.getElement(), is(sameInstance(client)));
+        assertThat(thrown.getCause(), is(sameInstance(exception)));
+    }
+}