network: prevent UI during install with no view

Ensure the UI is not initialized if there's no view during install when failed to start the main proxy (e.g. the port is already in use). Signed-off-by: thc202 <thc202@gmail.com>
zaproxy · Oct 6, 2023 · 1f88bdb · 1f88bdb
1 parent 868c3c4
commit 1f88bdb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/addOns/network/CHANGELOG.md b/addOns/network/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Update default user-agents.
 
+### Fixed
+- Do not initialise the view when failed to start the main proxy in `cmd` and `daemon` modes.
+
 ## [0.11.2] - 2023-09-27
 ### Fixed
 - Ensure the main proxy with custom port (`-port`) is stopped when initialising after installation in `cmd` and `daemon` modes.

diff --git a/addOns/network/src/main/java/org/zaproxy/addon/network/ExtensionNetwork.java b/addOns/network/src/main/java/org/zaproxy/addon/network/ExtensionNetwork.java
@@ -902,7 +902,7 @@ private void startLocalServers(String overrideAddress, int overridePort, boolean
             }
         } catch (Exception e) {
 
-            if (!install && (daemonMode || commandLineMode)) {
+            if (!install && !hasView()) {
                 String message =
                         "Failed to start the main proxy: "
                                 + e.getClass().getName()
@@ -927,7 +927,7 @@ private void startLocalServers(String overrideAddress, int overridePort, boolean
                             Constant.messages.getString(
                                     "network.cmdline.proxy.error.host.assign", address);
                 } else if (containsMessage(e, "denied") || containsMessage(e, "in use")) {
-                    if (promptUserMainProxyPort()) {
+                    if (hasView() && promptUserMainProxyPort()) {
                         return;
                     }
 
@@ -944,6 +944,12 @@ private void startLocalServers(String overrideAddress, int overridePort, boolean
                         Constant.messages.getString(
                                 "network.cmdline.proxy.error.generic", e.getMessage());
                 LOGGER.warn("Failed to start the main proxy: {}", e.getMessage());
+                if (!hasView()) {
+                    return;
+                }
+            } else if (!hasView()) {
+                LOGGER.warn("Failed to start the main proxy: {}", detailedError);
+                return;
             }
 
             JOptionPane.showMessageDialog(