Skip to content

[pull] main from zaproxy:main #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Sep 14, 2026
Merged

[pull] main from zaproxy:main #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b15703
Support control-return to submit all dialogs
psiinon Sep 11, 2026
dac687e
Merge pull request #9462 from psiinon/action-button
kingthorin Sep 14, 2026
6052256
Use Client Spider in Chrome AF plan
thc202 Sep 14, 2026
76aacea
Merge pull request #9466 from thc202/chrome-client
kingthorin Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/chrome/chrome.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
tests:
- name: "At least one URL found"
onFail: "WARN"
statistic: "spiderAjax.urls.added"
statistic: "stats.client.spider.urls"
site: ""
operator: ">="
value: 1
type: "stats"
name: "spiderAjax"
type: "spiderAjax"
name: "spiderClient"
type: "spiderClient"
38 changes: 38 additions & 0 deletions zap/src/main/java/org/parosproxy/paros/extension/AbstractDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@
import java.awt.HeadlessException;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.KeyStroke;
Expand All @@ -54,6 +56,8 @@ public abstract class AbstractDialog extends JDialog {

protected AbstractDialog thisDialog = null;

private JButton defaultButton;

/**
* Constructs an {@code AbstractDialog} with no owner and not modal.
*
Expand Down Expand Up @@ -114,6 +118,39 @@ public void actionPerformed(ActionEvent e) {
};
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escape, "ESCAPE");
getRootPane().getActionMap().put("ESCAPE", escapeAction);

// Handle ctrl+enter to trigger the dialog's default button, regardless of which
// component (e.g. a text area or table) currently has focus.
KeyStroke ctrlEnter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK);
AbstractAction ctrlEnterAction =
new AbstractAction() {
private static final long serialVersionUID = 1L;

@Override
public void actionPerformed(ActionEvent e) {
JButton button = getRootPane().getDefaultButton();
if (button != null && button.isEnabled()) {
button.doClick();
}
}
};
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ctrlEnter, "CTRL_ENTER");
getRootPane().getActionMap().put("CTRL_ENTER", ctrlEnterAction);
}

/**
* Sets the button to use as this dialog's main action (e.g. OK, Apply, Save), giving it the
* current look and feel's "default button" highlight and binding it to Ctrl+Enter.
*
* <p>Disposing a dialog clears its root pane's default button (see {@link
* JButton#removeNotify()}), so this is re-applied every time the dialog is shown, which matters
* for dialogs that are constructed once and reused across multiple show/dispose cycles.
*
* @param button the button to use as this dialog's main action, or {@code null} for none.
*/
protected void setDefaultButton(JButton button) {
this.defaultButton = button;
getRootPane().setDefaultButton(button);
}

/**
Expand All @@ -132,6 +169,7 @@ public void setVisible(boolean show) {
== 0) {
centreDialog();
}
getRootPane().setDefaultButton(defaultButton);
}
super.setVisible(show);
}
Expand Down
5 changes: 3 additions & 2 deletions zap/src/main/java/org/parosproxy/paros/extension/history/ExtensionHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,7 @@ public void purgeHistory(List<HistoryReference> hrefs) {
" ",
removeWithoutConfirmationCheckBox
};
String confirmButtonLabel = Constant.messages.getString("history.purge.confirm");
int result =
JOptionPane.showOptionDialog(
View.getSingleton().getMainFrame(),
Expand All @@ -951,10 +952,10 @@ public void purgeHistory(List<HistoryReference> hrefs) {
JOptionPane.QUESTION_MESSAGE,
null,
new String[] {
Constant.messages.getString("history.purge.confirm"),
confirmButtonLabel,
Constant.messages.getString("history.purge.cancel")
},
null);
confirmButtonLabel);
if (result != JOptionPane.YES_OPTION) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/parosproxy/paros/extension/option/OptionsConnectionPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ public boolean showRemoveDialogue(DomainMatcher e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
1 change: 1 addition & 0 deletions zap/src/main/java/org/parosproxy/paros/view/AbstractParamDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ private javax.swing.JPanel getJContentPane() {
GridBagConstraints.NONE,
GridBagConstraints.EAST,
new Insets(2, 2, 2, 2)));
this.setDefaultButton(getBtnOK());

jContentPane.add(footerPane, LayoutHelper.getGBC(0, 1, 1, 1.0, 0.0));
}
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/parosproxy/paros/view/FindDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void initialize() {
this.setContentPane(getJPanel());
centreDialog();
txtFind.requestFocus();
this.getRootPane().setDefaultButton(btnFind);
this.setDefaultButton(getBtnFind());
pack();
this.setVisible(true);
}
Expand Down
7 changes: 4 additions & 3 deletions zap/src/main/java/org/parosproxy/paros/view/SiteMapPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@ public void actionPerformed(ActionEvent e) {
" ",
removeWithoutConfirmationCheckBox
};
String confirmButtonLabel =
Constant.messages.getString("sites.purge.confirm");
int result =
JOptionPane.showOptionDialog(
View.getSingleton().getMainFrame(),
Expand All @@ -481,12 +483,11 @@ public void actionPerformed(ActionEvent e) {
JOptionPane.QUESTION_MESSAGE,
null,
new String[] {
Constant.messages.getString(
"sites.purge.confirm"),
confirmButtonLabel,
Constant.messages.getString(
"sites.purge.cancel")
},
null);
confirmButtonLabel);
if (result != JOptionPane.YES_OPTION) {
return;
}
Expand Down
1 change: 1 addition & 0 deletions zap/src/main/java/org/zaproxy/zap/extension/alert/AlertAddDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ private JPanel getJPanel() {
jPanel.add(jLabel2, gridBagConstraints13);
jPanel.add(getBtnCancel(), gridBagConstraints2);
jPanel.add(getBtnOk(), gridBagConstraints3);
this.setDefaultButton(getBtnOk());
}
return jPanel;
}
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/anticsrf/OptionsAntiCsrfPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public boolean showRemoveDialogue(AntiCsrfParamToken e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/api/ExtensionAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
new String[] {
confirmButtonLabel, cancelButtonLabel
},
null);
confirmButtonLabel);

if (option != JOptionPane.YES_OPTION) {
return;
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/api/OptionsApiPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public boolean showRemoveDialogue(DomainMatcher e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/ascan/OptionsVariantPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ public boolean showRemoveDialogue(ScannerParamFilter e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

return (option == JOptionPane.OK_OPTION);
}
Expand Down
12 changes: 12 additions & 0 deletions zap/src/main/java/org/zaproxy/zap/extension/autoupdate/ManageAddOnsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@ public void actionPerformed(ActionEvent e) {
getRootPane().getActionMap().put("ESCAPE", escapeAction);
}

@Override
public void setVisible(boolean visible) {
if (visible) {
// This dialog is created once and reused, and disposing it (as the close buttons do)
// clears the root pane's default button (see JButton#removeNotify()), so it must be
// re-applied every time the dialog is shown.
getRootPane().setDefaultButton(getCheckForUpdatesButton());
}
super.setVisible(visible);
}

private JPanel getTopPanel() {
if (topPanel == null) {
topPanel = new JPanel();
Expand Down Expand Up @@ -266,6 +277,7 @@ private JPanel getCorePanel(boolean update) {
corePanel.add(new JLabel(this.currentVersion), LayoutHelper.getGBC(0, 0, 1, 0.0D));
corePanel.add(new JLabel(""), LayoutHelper.getGBC(1, 0, 1, 1.0D));
corePanel.add(this.getCheckForUpdatesButton(), LayoutHelper.getGBC(2, 0, 1, 0.0D));
getRootPane().setDefaultButton(this.getCheckForUpdatesButton());
refresh = false;
}
} else if (latestInfo != null && this.latestInfo.getZapRelease() != null) {
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/autoupdate/OptionsCheckForUpdatesPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public boolean showRemoveDialogue(File f) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/brk/BreakPanelToolbarFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private int askForDropConfirmation() {
JOptionPane.QUESTION_MESSAGE,
null,
new String[] {confirmButtonLabel, cancelButtonLabel},
null);
confirmButtonLabel);

if (checkBox.isSelected()) {
breakpointsParams.setConfirmDropMessage(false);
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/custompages/ContextCustomPagePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public boolean showRemoveDialogue(CustomPage customPage) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/zaproxy/zap/extension/globalexcludeurl/OptionsGlobalExcludeURLPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public boolean showRemoveDialogue(GlobalExcludeURLParamToken e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/history/HistoryFilterPlusDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private void initialize() {
this.setSize(600, 300);
}
centreDialog();
this.getRootPane().setDefaultButton(btnApply);
this.setDefaultButton(getBtnApply());
this.pack();
}

Expand Down
1 change: 1 addition & 0 deletions zap/src/main/java/org/zaproxy/zap/extension/history/ManageTagsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ private JPanel getJPanel() {
jPanel.add(getBtnDelete(), gridBagConstraints31);
jPanel.add(getBtnCancel(), gridBagConstraints40);
jPanel.add(getBtnSave(), gridBagConstraints41);
this.setDefaultButton(getBtnSave());
}
return jPanel;
}
Expand Down
2 changes: 2 additions & 0 deletions zap/src/main/java/org/zaproxy/zap/extension/history/NotesAddDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ private void initialize() {

setContentPane(panel);

this.setDefaultButton(getBtnOk());

this.addWindowListener(
new java.awt.event.WindowAdapter() {

Expand Down
5 changes: 3 additions & 2 deletions zap/src/main/java/org/zaproxy/zap/extension/history/PopupMenuPurgeSites.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public void performHistoryReferenceActions(List<HistoryReference> hrefs) {
" ",
removeWithoutConfirmationCheckBox
};
String confirmButtonLabel = Constant.messages.getString("sites.purge.confirm");
int result =
JOptionPane.showOptionDialog(
View.getSingleton().getMainFrame(),
Expand All @@ -86,10 +87,10 @@ public void performHistoryReferenceActions(List<HistoryReference> hrefs) {
JOptionPane.QUESTION_MESSAGE,
null,
new String[] {
Constant.messages.getString("sites.purge.confirm"),
confirmButtonLabel,
Constant.messages.getString("sites.purge.cancel")
},
null);
confirmButtonLabel);
if (result != JOptionPane.YES_OPTION) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/httpsessions/OptionsHttpSessionsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public boolean showRemoveDialogue(HttpSessionToken e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/proxies/OptionsProxiesPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public boolean showRemoveDialogue(ProxiesParamProxy e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/pscan/OptionsPassiveScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public boolean showRemoveDialogue(
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/script/OptionsScriptPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public boolean showRemoveDialogue(File f) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
8 changes: 5 additions & 3 deletions zap/src/main/java/org/zaproxy/zap/extension/search/SearchPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ private void doSearch() {
}

if (pattern.matcher("").find()) {
String searchButtonLabel =
Constant.messages.getString(
"search.toolbar.warn.regex.match.empty.string.button.search");
int option =
JOptionPane.showOptionDialog(
View.getSingleton().getMainFrame(),
Expand All @@ -479,12 +482,11 @@ private void doSearch() {
JOptionPane.QUESTION_MESSAGE,
null,
new String[] {
Constant.messages.getString(
"search.toolbar.warn.regex.match.empty.string.button.search"),
searchButtonLabel,
Constant.messages.getString(
"search.toolbar.warn.regex.match.empty.string.button.cancel")
},
null);
searchButtonLabel);
if (option != JOptionPane.OK_OPTION) {
regEx.requestFocusInWindow();
return;
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/extension/users/ContextUsersPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public boolean showRemoveDialogue(User e) {
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL,
REMOVE_DIALOG_CANCEL_BUTTON_LABEL
},
null);
REMOVE_DIALOG_CONFIRM_BUTTON_LABEL);

if (option == JOptionPane.OK_OPTION) {
setRemoveWithoutConfirmation(removeWithoutConfirmationCheckBox.isSelected());
Expand Down
Loading
Loading