revert plugnhack changes

Signed-off-by: aryangupta701 <[email protected]>
zaproxy · Feb 27, 2024 · 04f3dbb · 04f3dbb
1 parent a8dcbf9
commit 04f3dbb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 120 deletions.
diff --git a/addOns/plugnhack/plugnhack.gradle.kts b/addOns/plugnhack/plugnhack.gradle.kts
@@ -31,19 +31,6 @@ zapAddOn {
                     }
                 }
             }
-
-            register("org.zaproxy.zap.extension.plugnhack.brk.ExtensionPlugNHackBrk") {
-                classnames {
-                    allowed.set(listOf("org.zaproxy.zap.extension.plugnhack.brk"))
-                }
-                dependencies {
-                    addOns {
-                        register("brk") {
-                            version.set(">=0.1")
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -56,5 +43,4 @@ zapAddOn {
 dependencies {
     zapAddOn("network")
     zapAddOn("requester")
-    zapAddOn("brk")
 }
diff --git a/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java b/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java
@@ -51,13 +51,13 @@
 import org.parosproxy.paros.network.HttpMalformedHeaderException;
 import org.parosproxy.paros.network.HttpMessage;
 import org.parosproxy.paros.view.View;
-import org.zaproxy.addon.brk.ExtensionBreak;
 import org.zaproxy.addon.network.ExtensionNetwork;
 import org.zaproxy.addon.network.server.ServerInfo;
 import org.zaproxy.zap.ZAP;
 import org.zaproxy.zap.extension.api.API;
 import org.zaproxy.zap.extension.api.ApiException;
 import org.zaproxy.zap.extension.api.ApiResponse;
+import org.zaproxy.zap.extension.brk.ExtensionBreak;
 import org.zaproxy.zap.extension.help.ExtensionHelp;
 import org.zaproxy.zap.extension.httppanel.Message;
 import org.zaproxy.zap.extension.httppanel.component.HttpPanelComponentInterface;
@@ -157,14 +157,6 @@ public class ExtensionPlugNHack extends ExtensionAdaptor
 
     private ExtensionNetwork extensionNetwork;
 
-    ExtensionBreak extBreak;
-
-    static boolean coreBrkDisabled;
-
-    static {
-        coreBrkDisabled = ExtensionBreak.class.getAnnotation(Deprecated.class) != null;
-    }
-
     /*
      * TODO
      * Handle mode
@@ -222,21 +214,19 @@ public void run() {
                         this.setName("ZAP-pnh-timeout");
                         // Can't init extBreak here - Control wont have been initialized
                         boolean ctrlInit = false;
+                        ExtensionBreak extBreak = null;
                         while (!shutdown) {
                             try {
                                 sleep(poll);
 
-                                if (!ctrlInit
-                                        && Control.getSingleton() != null
-                                        && !coreBrkDisabled) {
+                                if (!ctrlInit && Control.getSingleton() != null) {
                                     extBreak =
                                             (ExtensionBreak)
                                                     Control.getSingleton()
                                                             .getExtensionLoader()
                                                             .getExtension(ExtensionBreak.NAME);
                                     ctrlInit = true;
                                 }
-
                                 if (extBreak != null
                                         && (extBreak.getBreakpointManagementInterface()
                                                         .isBreakRequest()
@@ -300,10 +290,7 @@ public void hook(ExtensionHook extensionHook) {
             ExtensionLoader extLoader = Control.getSingleton().getExtensionLoader();
 
             // setup Breakpoints
-            if (!coreBrkDisabled) {
-                extBreak = (ExtensionBreak) extLoader.getExtension(ExtensionBreak.NAME);
-            }
-
+            ExtensionBreak extBreak = (ExtensionBreak) extLoader.getExtension(ExtensionBreak.NAME);
             if (extBreak != null) {
                 // setup custom breakpoint handler
                 brkMessageHandler =
@@ -351,9 +338,7 @@ public void unload() {
             ExtensionLoader extLoader = Control.getSingleton().getExtensionLoader();
 
             // clear up Breakpoints
-            if (!coreBrkDisabled) {
-                extBreak = (ExtensionBreak) extLoader.getExtension(ExtensionBreak.NAME);
-            }
+            ExtensionBreak extBreak = (ExtensionBreak) extLoader.getExtension(ExtensionBreak.NAME);
             if (extBreak != null) {
                 extBreak.removeBreakpointsUiManager(getBrkManager());
             }
@@ -921,13 +906,11 @@ protected void messageChanged(ClientMessage msg) {
 
     protected ClientBreakpointsUiManagerInterface getBrkManager() {
         if (brkManager == null) {
-            if (!coreBrkDisabled) {
-                extBreak =
-                        (ExtensionBreak)
-                                Control.getSingleton()
-                                        .getExtensionLoader()
-                                        .getExtension(ExtensionBreak.NAME);
-            }
+            ExtensionBreak extBreak =
+                    (ExtensionBreak)
+                            Control.getSingleton()
+                                    .getExtensionLoader()
+                                    .getExtension(ExtensionBreak.NAME);
             if (extBreak != null) {
                 brkManager = new ClientBreakpointsUiManagerInterface(this, extBreak);
             }

diff --git a/...gnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointMessage.java b/...gnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointMessage.java
@@ -22,7 +22,7 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import org.parosproxy.paros.Constant;
-import org.zaproxy.addon.brk.AbstractBreakPointMessage;
+import org.zaproxy.zap.extension.brk.AbstractBreakPointMessage;
 import org.zaproxy.zap.extension.httppanel.Message;
 import org.zaproxy.zap.extension.plugnhack.ClientMessage;
 

diff --git a/...src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointMessageHandler.java b/...src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointMessageHandler.java
@@ -19,8 +19,8 @@
  */
 package org.zaproxy.zap.extension.plugnhack.brk;
 
-import org.zaproxy.addon.brk.BreakpointManagementInterface;
-import org.zaproxy.addon.brk.BreakpointMessageHandler2;
+import org.zaproxy.zap.extension.brk.BreakpointManagementInterface;
+import org.zaproxy.zap.extension.brk.BreakpointMessageHandler2;
 import org.zaproxy.zap.extension.httppanel.Message;
 import org.zaproxy.zap.extension.plugnhack.ClientMessage;
 

diff --git a/...ain/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointsUiManagerInterface.java b/...ain/java/org/zaproxy/zap/extension/plugnhack/brk/ClientBreakpointsUiManagerInterface.java
@@ -19,9 +19,9 @@
  */
 package org.zaproxy.zap.extension.plugnhack.brk;
 
-import org.zaproxy.addon.brk.BreakpointMessageInterface;
-import org.zaproxy.addon.brk.BreakpointsUiManagerInterface;
-import org.zaproxy.addon.brk.ExtensionBreak;
+import org.zaproxy.zap.extension.brk.BreakpointMessageInterface;
+import org.zaproxy.zap.extension.brk.BreakpointsUiManagerInterface;
+import org.zaproxy.zap.extension.brk.ExtensionBreak;
 import org.zaproxy.zap.extension.httppanel.Message;
 import org.zaproxy.zap.extension.plugnhack.ClientMessage;
 import org.zaproxy.zap.extension.plugnhack.ExtensionPlugNHack;

diff --git a/...lugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ExtensionPlugNHackBrk.java b/...lugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/ExtensionPlugNHackBrk.java
diff --git a/...gnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/PopupMenuAddBreakClient.java b/...gnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/PopupMenuAddBreakClient.java
@@ -25,7 +25,7 @@
 import org.apache.logging.log4j.Logger;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.ExtensionPopupMenuItem;
-import org.zaproxy.addon.brk.ExtensionBreak;
+import org.zaproxy.zap.extension.brk.ExtensionBreak;
 import org.zaproxy.zap.extension.plugnhack.ClientsPanel;
 import org.zaproxy.zap.extension.plugnhack.MessageListTableModel;
 

diff --git a/...s/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/PopupMenuEditBreak.java b/...s/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/brk/PopupMenuEditBreak.java
@@ -22,8 +22,8 @@
 import java.awt.Component;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.ExtensionPopupMenuItem;
-import org.zaproxy.addon.brk.BreakpointsPanel;
-import org.zaproxy.addon.brk.ExtensionBreak;
+import org.zaproxy.zap.extension.brk.BreakpointsPanel;
+import org.zaproxy.zap.extension.brk.ExtensionBreak;
 
 @SuppressWarnings("serial")
 public class PopupMenuEditBreak extends ExtensionPopupMenuItem {