search

SasanLabs / owasp-zap-jwt-addon

OWASP ZAP addon for finding vulnerabilities in JWT Implementations
https://www.zaproxy.org/
Apache License 2.0
30 stars 10 forks source link

Incorporating review comments #2

Closed preetkaran20 closed 4 years ago

kingthorin commented 4 years ago

Based on modification to 775ef2b I'd suggest:

diff --git a/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java b/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
index 207b42b..ec70fba 100644
--- a/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
+++ b/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
@@ -82,7 +82,6 @@
                         settingsPanel,
                         ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                         ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        settingsScrollPane.setPreferredSize(new Dimension(300, 300));
         this.add(settingsScrollPane, BorderLayout.NORTH);
         footerPanel = new JPanel();
         this.add(footerPanel, BorderLayout.SOUTH);
@@ -93,9 +92,7 @@
     }

     private void init(JPanel settingsPanel) {
-        settingsPanel.add(Box.createRigidArea(new Dimension(0, 10)));
         settingsPanel.add(this.rsaSettingsSection());
-        settingsPanel.add(Box.createRigidArea(new Dimension(0, 10)));
         settingsPanel.add(this.generalSettingsSection());
         footerPanel.add(getResetButton());
     }
@@ -174,7 +171,6 @@

     private JPanel rsaSettingsSection() {
         JPanel rsaPanel = new JPanel();
-        rsaPanel.setSize(rsaPanel.getPreferredSize());
         GridBagLayout gridBagLayout = new GridBagLayout();
         rsaPanel.setLayout(gridBagLayout);
         GridBagConstraints gridBagConstraints = this.getGridBagConstraints();
@@ -184,8 +180,7 @@
                         JWTI18n.getMessage("jwt.settings.rsa.header"),
                         TitledBorder.DEFAULT_JUSTIFICATION,
                         TitledBorder.DEFAULT_POSITION,
-                        FontUtils.getFont(Font.BOLD, FontUtils.Size.standard),
-                        java.awt.Color.black);
+                        FontUtils.getFont(FontUtils.Size.standard));
         rsaPanel.setBorder(rsaPanelBorder);
         JLabel lblTrustStorePathAttribute =
                 new JLabel(JWTI18n.getMessage("jwt.settings.rsa.trustStorePath"));
@@ -224,15 +219,13 @@

     private JPanel generalSettingsSection() {
         JPanel generalSettingsPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
-        generalSettingsPanel.setSize(generalSettingsPanel.getPreferredSize());
         TitledBorder generalSettingsBorder =
                 BorderFactory.createTitledBorder(
                         null,
                         JWTI18n.getMessage("jwt.settings.general.header"),
                         TitledBorder.DEFAULT_JUSTIFICATION,
                         TitledBorder.DEFAULT_POSITION,
-                        FontUtils.getFont(Font.BOLD, FontUtils.Size.standard),
-                        java.awt.Color.black);
+                        FontUtils.getFont(FontUtils.Size.standard));
         generalSettingsPanel.setBorder(generalSettingsBorder);
         enableClientConfigurationScanCheckBox =
                 new JCheckBox(

image image

preetkaran20 commented 4 years ago

Based on modification to 775ef2b I'd suggest:

diff --git a/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java b/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
index 207b42b..ec70fba 100644
--- a/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
+++ b/src/main/java/org/zaproxy/zap/extension/jwt/ui/JWTOptionsPanel.java
@@ -82,7 +82,6 @@
                         settingsPanel,
                         ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                         ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        settingsScrollPane.setPreferredSize(new Dimension(300, 300));
         this.add(settingsScrollPane, BorderLayout.NORTH);
         footerPanel = new JPanel();
         this.add(footerPanel, BorderLayout.SOUTH);
@@ -93,9 +92,7 @@
     }

     private void init(JPanel settingsPanel) {
-        settingsPanel.add(Box.createRigidArea(new Dimension(0, 10)));
         settingsPanel.add(this.rsaSettingsSection());
-        settingsPanel.add(Box.createRigidArea(new Dimension(0, 10)));
         settingsPanel.add(this.generalSettingsSection());
         footerPanel.add(getResetButton());
     }
@@ -174,7 +171,6 @@

     private JPanel rsaSettingsSection() {
         JPanel rsaPanel = new JPanel();
-        rsaPanel.setSize(rsaPanel.getPreferredSize());
         GridBagLayout gridBagLayout = new GridBagLayout();
         rsaPanel.setLayout(gridBagLayout);
         GridBagConstraints gridBagConstraints = this.getGridBagConstraints();
@@ -184,8 +180,7 @@
                         JWTI18n.getMessage("jwt.settings.rsa.header"),
                         TitledBorder.DEFAULT_JUSTIFICATION,
                         TitledBorder.DEFAULT_POSITION,
-                        FontUtils.getFont(Font.BOLD, FontUtils.Size.standard),
-                        java.awt.Color.black);
+                        FontUtils.getFont(FontUtils.Size.standard));
         rsaPanel.setBorder(rsaPanelBorder);
         JLabel lblTrustStorePathAttribute =
                 new JLabel(JWTI18n.getMessage("jwt.settings.rsa.trustStorePath"));
@@ -224,15 +219,13 @@

     private JPanel generalSettingsSection() {
         JPanel generalSettingsPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
-        generalSettingsPanel.setSize(generalSettingsPanel.getPreferredSize());
         TitledBorder generalSettingsBorder =
                 BorderFactory.createTitledBorder(
                         null,
                         JWTI18n.getMessage("jwt.settings.general.header"),
                         TitledBorder.DEFAULT_JUSTIFICATION,
                         TitledBorder.DEFAULT_POSITION,
-                        FontUtils.getFont(Font.BOLD, FontUtils.Size.standard),
-                        java.awt.Color.black);
+                        FontUtils.getFont(FontUtils.Size.standard));
         generalSettingsPanel.setBorder(generalSettingsBorder);
         enableClientConfigurationScanCheckBox =
                 new JCheckBox(

image image

Sure, will update the code.

preetkaran20 commented 4 years ago

Hi @kingthorin ,

I have updated this PR with the suggested changes. Also i have raised a PR in scanners.md: https://github.com/zaproxy/zaproxy/pull/5974 please review.

thanks, Karan