From 7e0955c9977268b785cdae4f44d8f402a645e38e Mon Sep 17 00:00:00 2001 From: Jesse Chung Date: Wed, 18 Sep 2024 17:17:55 -0400 Subject: [PATCH 1/3] current work --- .../zap/extension/quickstart/AttackPanel.java | 27 ++++++++++++++++++- .../extension/quickstart/AttackThread.java | 16 +++++++---- .../quickstart/resources/Messages.properties | 5 ++++ .../org/zaproxy/addon/spider/SpiderAPI.java | 1 + 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java index 6af055d3ce9..48a8437220b 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java @@ -84,6 +84,7 @@ public String getTitleKey() { @Override public JPanel getDescriptionPanel() { JPanel panel = new QuickStartBackgroundPanel(); + // here we are. God damn it panel.add( QuickStartHelper.getWrappedLabel("quickstart.attack.panel.message1"), LayoutHelper.getGBC(0, 0, 2, 1.0D, DisplayUtils.getScaledInsets(5, 5, 5, 5))); @@ -152,9 +153,11 @@ public JPanel getContentPanel() { traditionalSpiderY = ++formPanelY; plugableSpiderY = ++formPanelY; - + + // this sets the horizontal panel for the start and stop buttons I guess? JPanel buttonPanel = QuickStartHelper.getHorizontalPanel(); buttonPanel.add(this.getAttackButton()); + buttonPanel.add(this.getPauseButton()); buttonPanel.add(this.getStopButton()); buttonPanel.add(Box.createHorizontalGlue()); contentPanel.add(buttonPanel, LayoutHelper.getGBC(2, ++formPanelY, 1, 1.0D)); @@ -331,6 +334,7 @@ private JButton getAttackButton() { attackButton.setToolTipText( Constant.messages.getString("quickstart.button.tooltip.attack")); + // attackButton.addActionListener( e -> { if ((traditionalSpider == null || !traditionalSpider.isSelected()) @@ -348,6 +352,26 @@ private JButton getAttackButton() { return attackButton; } + // what are we doing here? + private JButton getPauseButton() { + if (stopButton == null) { + stopButton = new JButton(); + stopButton.setText(Constant.messages.getString("quickstart.button.label.pause")); + stopButton.setIcon( + DisplayUtils.getScaledIcon( + new ImageIcon( + SearchPanel.class.getResource( + "/resource/icon/16/141.png")))); // 'pause' + // icon + stopButton.setToolTipText( + Constant.messages.getString("quickstart.button.tooltip.stop")); + stopButton.setEnabled(false); + + stopButton.addActionListener(e -> stopAttack()); + } + return stopButton; + } + private JButton getStopButton() { if (stopButton == null) { stopButton = new JButton(); @@ -367,6 +391,7 @@ private JButton getStopButton() { return stopButton; } + //! this part attacks boolean attackUrl() { Object item = this.getUrlField().getSelectedItem(); if (item == null || DEFAULT_VALUE_URL_FIELD.equals(item.toString())) { diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java index 9fa818fcd6d..84adf7d30da 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java @@ -32,15 +32,16 @@ import org.zaproxy.zap.utils.Stats; public class AttackThread extends Thread { - + //Maybe another field for paused? Just so we can get the thing rolling agin easily public enum Progress { - notstarted, - started, - spider, ajaxspider, ascan, - failed, complete, + failed, + notstarted, + paused, + spider, + started, stopped } @@ -49,6 +50,8 @@ public enum Progress { private TraditionalSpider traditionalSpider; private PlugableSpider plugableSpider; private boolean stopAttack = false; + private boolean pauseAttack = false; + private boolean useStdSpider; private static final Logger LOGGER = LogManager.getLogger(AttackThread.class); @@ -77,6 +80,7 @@ public void setPlugableSpider(PlugableSpider plugableSpider) { @Override public void run() { stopAttack = false; + pauseAttack = false; boolean completed = false; try { Stats.incCounter("stats.quickstart.attack"); @@ -89,6 +93,8 @@ public void run() { // the problem return; } + + // what the heck am I supposed to do here? if (stopAttack) { LOGGER.debug("Attack stopped manually"); extension.notifyProgress(Progress.stopped); diff --git a/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties b/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties index 6d024b716ba..ef6d7b8bce2 100644 --- a/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties +++ b/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties @@ -9,6 +9,11 @@ quickstart.button.label.attack = Attack quickstart.button.label.back = < quickstart.button.label.launch = Launch Browser quickstart.button.label.stop = Stop +# Fix here +quickstart.button.label.pause = Pause +quickstart.button.label.unpause = Unpause + + quickstart.button.news = Learn More quickstart.button.tooltip.attack = Perform a quick penetration test on the URL quickstart.button.tooltip.back = Back to the main screen diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java index c055acc2038..56937071fba 100644 --- a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java +++ b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java @@ -295,6 +295,7 @@ public ApiResponse handleApiAction(String name, JSONObject params) throws ApiExc return new ApiResponseElement(name, Integer.toString(scanId)); + // something here. case ACTION_PAUSE_SCAN: scan = getSpiderScan(params); extension.pauseScan(scan.getScanId()); From e86d8e73ab381b08313c6b59ad11e5c8adc3cd1a Mon Sep 17 00:00:00 2001 From: Jesse Chung Date: Tue, 24 Sep 2024 16:12:52 -0400 Subject: [PATCH 2/3] more stuff pushed up, pause seems to be working maybe. Hard to say but resume is not working. It might be that we can just use the start logic. --- .../zap/extension/quickstart/AttackPanel.java | 42 ++++++++++++- .../extension/quickstart/AttackThread.java | 60 ++++++++++++++++++- .../quickstart/ExtensionQuickStart.java | 16 +++++ .../quickstart/TraditionalSpider.java | 5 ++ .../spider/ExtensionQuickStartSpider.java | 10 ++++ .../quickstart/resources/Messages.properties | 4 +- 6 files changed, 131 insertions(+), 6 deletions(-) diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java index 48a8437220b..4d6a5e5a57c 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java @@ -158,7 +158,7 @@ public JPanel getContentPanel() { JPanel buttonPanel = QuickStartHelper.getHorizontalPanel(); buttonPanel.add(this.getAttackButton()); buttonPanel.add(this.getPauseButton()); - buttonPanel.add(this.getStopButton()); + // buttonPanel.add(this.getStopButton()); buttonPanel.add(Box.createHorizontalGlue()); contentPanel.add(buttonPanel, LayoutHelper.getGBC(2, ++formPanelY, 1, 1.0D)); @@ -175,6 +175,7 @@ public JPanel getContentPanel() { return contentPanel; } + //! I think something needs to be here. private JLabel getProgressLabel() { if (progressLabel == null) { @@ -337,6 +338,7 @@ private JButton getAttackButton() { // attackButton.addActionListener( e -> { + // if ((traditionalSpider == null || !traditionalSpider.isSelected()) && (plugableSpider == null || !plugableSpider.isSelected())) { getExtensionQuickStart() @@ -346,13 +348,18 @@ private JButton getAttackButton() { "quickstart.url.warning.nospider")); } else { attackUrl(); + // change the button to pause for now. + + //we also need some kind of check if it is currently paused + attackButton.setText(Constant.messages.getString("quickstart.button.label.pause")); + // we need something to check what the state of the scan is at this moment. } }); } return attackButton; } - // what are we doing here? + // Likely not needed given new requirements given :) private JButton getPauseButton() { if (stopButton == null) { stopButton = new JButton(); @@ -367,7 +374,17 @@ private JButton getPauseButton() { Constant.messages.getString("quickstart.button.tooltip.stop")); stopButton.setEnabled(false); - stopButton.addActionListener(e -> stopAttack()); + stopButton.addActionListener(e -> { + + // need to check if paused. We need to check if the button was already clicked maybe? + //just check if it paused and then handle accordingly + boolean checkPause = checkPauseStatus(); + if (checkPause == true) { + resumeAttack(); + } else { + togglePauseAttack(); + } + }); } return stopButton; } @@ -446,6 +463,25 @@ private void stopAttack() { stopButton.setEnabled(false); } + private void togglePauseAttack() { + getExtensionQuickStart().togglePauseAttack(); + + // stopButton.setEnabled(false); + } + + private void resumeAttack() { + getExtensionQuickStart().togglePauseAttack(); + + // stopButton.setEnabled(false); + } + + + private boolean checkPauseStatus() { + return getExtensionQuickStart().checkPause(); + + // stopButton.setEnabled(false); + } + private void setSpiderButtonsEnabled(boolean enabled) { if (traditionalSpider != null) { traditionalSpider.setEnabled(enabled); diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java index 84adf7d30da..2c2e24fb45b 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java @@ -32,7 +32,6 @@ import org.zaproxy.zap.utils.Stats; public class AttackThread extends Thread { - //Maybe another field for paused? Just so we can get the thing rolling agin easily public enum Progress { ajaxspider, ascan, @@ -51,6 +50,10 @@ public enum Progress { private PlugableSpider plugableSpider; private boolean stopAttack = false; private boolean pauseAttack = false; + private boolean resumeAttack = false; + + private boolean currentlyAttacking = false; + private boolean useStdSpider; @@ -77,10 +80,13 @@ public void setPlugableSpider(PlugableSpider plugableSpider) { this.plugableSpider = plugableSpider; } + // running causes everything to be started. As a result stopAttack and pauseAttack are to be set to false @Override public void run() { stopAttack = false; pauseAttack = false; + currentlyAttacking = true; + boolean completed = false; try { Stats.incCounter("stats.quickstart.attack"); @@ -100,6 +106,15 @@ public void run() { extension.notifyProgress(Progress.stopped); return; } + + if (pauseAttack) { + LOGGER.debug("Attack paused manually"); + extension.notifyProgress(Progress.paused); + return; + } + + + Target target = new Target(startNode); target.setRecurse(true); if (plugableSpider != null) { @@ -127,7 +142,13 @@ public void run() { if (this.stopAttack) { spiderScan.stopScan(); break; + } else if (this.pauseAttack) { + spiderScan.pauseScan(); + break; + } else if (this.resumeAttack) { + spiderScan.resumeScan(); } + extension.notifyProgress(Progress.spider, spiderScan.getProgress()); } } catch (InterruptedException e) { @@ -139,6 +160,13 @@ public void run() { return; } + if (pauseAttack) { + LOGGER.debug("Attack paused manually jesse2"); + extension.notifyProgress(Progress.paused); + return; + } + + // Pause after the spider seems to help sleep(2000); } @@ -149,6 +177,12 @@ public void run() { return; } + if (pauseAttack) { + LOGGER.debug("Attack paused manually jesse3"); + extension.notifyProgress(Progress.paused); + return; + } + // optionally invoke ajax spider here if (plugableSpider != null && plugableSpider.isSelected()) { plugableSpider.startScan(this.url.toURI()); @@ -201,6 +235,10 @@ public void run() { sleep(500); if (this.stopAttack) { extAscan.stopScan(scanId); + } else if (this.pauseAttack) { + extAscan.pauseScan(scanId); + } else if (this.resumeAttack) { + extAscan.resumeScan(scanId); } extension.notifyProgress(Progress.ascan, ascan.getProgress()); } @@ -221,6 +259,9 @@ public void run() { } else if (stopAttack) { LOGGER.debug("Attack stopped manually"); extension.notifyProgress(Progress.stopped); + } else if (pauseAttack) { + LOGGER.debug("Attack paused manually Jesse5"); + extension.notifyProgress(Progress.paused); } else { LOGGER.debug("Attack completed"); extension.notifyProgress(Progress.complete); @@ -231,4 +272,21 @@ public void run() { public void stopAttack() { this.stopAttack = true; } + + public void togglePauseAttack() { + this.pauseAttack = true; + this.resumeAttack = false; + // this.currentlyAttacking = true; + } + + public boolean returnPauseState() { + return this.pauseAttack; + // this.currentlyAttacking = true; + } + + + public void resumeAttack() { + this.pauseAttack = false; + this.resumeAttack = true; + } } diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java index 31f9e1964d1..15e74ef2e4c 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java @@ -461,6 +461,22 @@ public void stopAttack() { } } + public void togglePauseAttack() { + if (attackThread != null) { + attackThread.togglePauseAttack(); + } + } + + public void resumeAttack() { + if (attackThread != null) { + attackThread.resumeAttack(); + } + } + + public boolean checkPause() { + return attackThread.returnPauseState(); + } + public void showOnStart(boolean showOnStart) { if (!showOnStart) { // Remove the tab right away diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/TraditionalSpider.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/TraditionalSpider.java index a48c5764294..5a599ae622b 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/TraditionalSpider.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/TraditionalSpider.java @@ -40,6 +40,11 @@ public interface Scan { void stopScan(); + void pauseScan(); + + void resumeScan(); + + int getProgress(); } } diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java index 11e2cec7055..fd9fc5c3600 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java @@ -134,6 +134,16 @@ public void stopScan() { scan.stopScan(); } + @Override + public void pauseScan() { + scan.pauseScan(); + } + + @Override + public void resumeScan() { + scan.resumeScan(); + } + @Override public int getProgress() { return scan.getProgress(); diff --git a/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties b/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties index 69b82849890..6dec5d4c01f 100644 --- a/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties +++ b/addOns/quickstart/src/main/resources/org/zaproxy/zap/extension/quickstart/resources/Messages.properties @@ -10,8 +10,8 @@ quickstart.button.label.back = < quickstart.button.label.launch = Launch Browser quickstart.button.label.stop = Stop # Fix here -quickstart.button.label.pause = Pause -quickstart.button.label.unpause = Unpause +quickstart.button.label.pause = Pause1 +quickstart.button.label.unpause = Unpause1 quickstart.button.news = Learn More From 31a65eebd9edfb3314173667eaf1da12bd389b67 Mon Sep 17 00:00:00 2001 From: Jesse Chung Date: Thu, 26 Sep 2024 17:17:25 -0400 Subject: [PATCH 3/3] #8271 stuck --- .../zap/extension/quickstart/AttackPanel.java | 14 +++++++++++++- .../zap/extension/quickstart/AttackThread.java | 18 +++++++++++------- .../quickstart/ExtensionQuickStart.java | 5 +++++ .../spider/ExtensionQuickStartSpider.java | 1 + .../org/zaproxy/addon/spider/SpiderThread.java | 5 +++++ .../zap/extension/tokengen/TokenPanel.java | 1 + 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java index 4d6a5e5a57c..e8f0672e7a6 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackPanel.java @@ -20,6 +20,9 @@ package org.zaproxy.zap.extension.quickstart; import java.awt.GridBagLayout; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.net.URL; import java.util.List; import javax.swing.Box; @@ -48,6 +51,7 @@ public class AttackPanel extends QuickStartSubPanel { private static final long serialVersionUID = 1L; private static final String DEFAULT_VALUE_URL_FIELD = "http://"; + private static final Logger LOGGER = LogManager.getLogger(AttackPanel.class); private ImageIcon icon; private JButton attackButton; @@ -379,6 +383,13 @@ private JButton getPauseButton() { // need to check if paused. We need to check if the button was already clicked maybe? //just check if it paused and then handle accordingly boolean checkPause = checkPauseStatus(); + System.out.println(checkPause); + System.out.println("checkPause"); + LOGGER.debug("what is this"); + LOGGER.debug(checkPause); + LOGGER.info("does this help?"); + + if (checkPause == true) { resumeAttack(); } else { @@ -464,13 +475,14 @@ private void stopAttack() { } private void togglePauseAttack() { + LOGGER.info("toggle"); getExtensionQuickStart().togglePauseAttack(); // stopButton.setEnabled(false); } private void resumeAttack() { - getExtensionQuickStart().togglePauseAttack(); + getExtensionQuickStart().resumeAttack(); // stopButton.setEnabled(false); } diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java index 2c2e24fb45b..27c291fe056 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/AttackThread.java @@ -56,7 +56,7 @@ public enum Progress { private boolean useStdSpider; - +//! s private static final Logger LOGGER = LogManager.getLogger(AttackThread.class); private static final HttpRequestConfig REQ_CONFIG = @@ -109,7 +109,7 @@ public void run() { if (pauseAttack) { LOGGER.debug("Attack paused manually"); - extension.notifyProgress(Progress.paused); + // extension.notifyProgress(Progress.paused); return; } @@ -146,7 +146,9 @@ public void run() { spiderScan.pauseScan(); break; } else if (this.resumeAttack) { + LOGGER.debug("running resume scan"); spiderScan.resumeScan(); + break; } extension.notifyProgress(Progress.spider, spiderScan.getProgress()); @@ -162,7 +164,7 @@ public void run() { if (pauseAttack) { LOGGER.debug("Attack paused manually jesse2"); - extension.notifyProgress(Progress.paused); + // extension.notifyProgress(Progress.paused); return; } @@ -179,7 +181,7 @@ public void run() { if (pauseAttack) { LOGGER.debug("Attack paused manually jesse3"); - extension.notifyProgress(Progress.paused); + // extension.notifyProgress(Progress.paused); return; } @@ -261,7 +263,7 @@ public void run() { extension.notifyProgress(Progress.stopped); } else if (pauseAttack) { LOGGER.debug("Attack paused manually Jesse5"); - extension.notifyProgress(Progress.paused); + // extension.notifyProgress(Progress.paused); } else { LOGGER.debug("Attack completed"); extension.notifyProgress(Progress.complete); @@ -274,6 +276,8 @@ public void stopAttack() { } public void togglePauseAttack() { + LOGGER.debug("paused inside the toggle"); + this.pauseAttack = true; this.resumeAttack = false; // this.currentlyAttacking = true; @@ -284,9 +288,9 @@ public boolean returnPauseState() { // this.currentlyAttacking = true; } - public void resumeAttack() { + LOGGER.debug("we are changing the variables inside"); this.pauseAttack = false; - this.resumeAttack = true; + // this.resumeAttack = true; } } diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java index 15e74ef2e4c..adce5120d77 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/ExtensionQuickStart.java @@ -425,6 +425,7 @@ public void notifyProgress(AttackThread.Progress progress, String msg) { break; case failed: case complete: + case paused: case stopped: this.runningFromCmdLine = false; break; @@ -468,7 +469,11 @@ public void togglePauseAttack() { } public void resumeAttack() { + LOGGER.info("What are we doing here. Is attackThread null?"); + // it is not null + LOGGER.info(attackThread); if (attackThread != null) { + LOGGER.info("inside the check"); attackThread.resumeAttack(); } } diff --git a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java index fd9fc5c3600..440a3fc27cc 100644 --- a/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java +++ b/addOns/quickstart/src/main/java/org/zaproxy/zap/extension/quickstart/spider/ExtensionQuickStartSpider.java @@ -132,6 +132,7 @@ public boolean isStopped() { @Override public void stopScan() { scan.stopScan(); + // investigate this } @Override diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderThread.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderThread.java index 09e071d83ec..9ef8083ca39 100644 --- a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderThread.java +++ b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderThread.java @@ -171,6 +171,7 @@ private void runScan() { @Override public void stopScan() { + // a big deal if (spider != null) { spider.stop(); } @@ -197,6 +198,10 @@ public DefaultListModel getList() { @Override public void pauseScan() { + // this is problematic + + LOGGER.debug("pausing yoyo"); + if (spider != null) { spider.pause(); } diff --git a/addOns/tokengen/src/main/java/org/zaproxy/zap/extension/tokengen/TokenPanel.java b/addOns/tokengen/src/main/java/org/zaproxy/zap/extension/tokengen/TokenPanel.java index b1e382fe9b3..a259e6e7246 100644 --- a/addOns/tokengen/src/main/java/org/zaproxy/zap/extension/tokengen/TokenPanel.java +++ b/addOns/tokengen/src/main/java/org/zaproxy/zap/extension/tokengen/TokenPanel.java @@ -263,6 +263,7 @@ private JToggleButton getPauseScanButton() { new ImageIcon(getClass().getResource("/resource/icon/16/131.png"))); pauseScanButton.setEnabled(false); pauseScanButton.addActionListener(e -> pauseScan()); + // something is amiss } return pauseScanButton; }