Dialogs

src/main/java/burp/JWTEditorExtension.java

@@ -25,7 +25,6 @@
 import com.blackberry.jwteditor.view.editor.WebSocketEditorView;
 import com.blackberry.jwteditor.view.hexcodearea.HexCodeAreaFactory;
 import com.blackberry.jwteditor.view.rsta.RstaFactory;
-import com.blackberry.jwteditor.view.utils.ErrorLoggingActionListenerFactory;
 
 import java.awt.*;
 
@@ -69,7 +68,6 @@ public void initialize(MontoyaApi api) {
         userInterface.registerSuiteTab(suiteView.getTabCaption(), suiteView.getUiComponent());
 
         HexCodeAreaFactory hexAreaCodeFactory = new HexCodeAreaFactory(api.logging(), api.userInterface());
-        ErrorLoggingActionListenerFactory actionListenerFactory = new ErrorLoggingActionListenerFactory(api.logging());
         InformationPanelFactory informationPanelFactory = new InformationPanelFactory(api.userInterface(), api.logging());
 
         userInterface.registerHttpRequestEditorProvider(editorCreationContext ->
@@ -78,7 +76,7 @@ public void initialize(MontoyaApi api) {
                         rstaFactory,
                         api.collaborator().defaultPayloadGenerator(),
                         hexAreaCodeFactory,
-                        actionListenerFactory,
+                        api.logging(),
                         informationPanelFactory,
                         editorCreationContext.editorMode() != READ_ONLY,
                         isProVersion
@@ -91,7 +89,7 @@ public void initialize(MontoyaApi api) {
                         rstaFactory,
                         api.collaborator().defaultPayloadGenerator(),
                         hexAreaCodeFactory,
-                        actionListenerFactory,
+                        api.logging(),
                         informationPanelFactory,
                         editorCreationContext.editorMode() != READ_ONLY,
                         isProVersion
@@ -104,7 +102,7 @@ public void initialize(MontoyaApi api) {
                         rstaFactory,
                         api.collaborator().defaultPayloadGenerator(),
                         hexAreaCodeFactory,
-                        actionListenerFactory,
+                        api.logging(),
                         informationPanelFactory,
                         editorCreationContext.editorMode() != READ_ONLY,
                         isProVersion

src/main/java/com/blackberry/jwteditor/presenter/EditorPresenter.java

@@ -19,6 +19,7 @@
 package com.blackberry.jwteditor.presenter;
 
 import burp.api.montoya.collaborator.CollaboratorPayloadGenerator;
+import burp.api.montoya.logging.Logging;
 import com.blackberry.jwteditor.model.jose.*;
 import com.blackberry.jwteditor.model.keys.Key;
 import com.blackberry.jwteditor.model.keys.KeyRing;
@@ -28,7 +29,6 @@
 import com.blackberry.jwteditor.view.dialog.operations.*;
 import com.blackberry.jwteditor.view.editor.EditorMode;
 import com.blackberry.jwteditor.view.editor.EditorView;
-import com.blackberry.jwteditor.view.utils.ErrorLoggingActionListenerFactory;
 import com.nimbusds.jose.util.Base64URL;
 import org.json.JSONException;
 
@@ -45,6 +45,7 @@
 import static com.blackberry.jwteditor.utils.Base64URLUtils.base64UrlEncodeJson;
 import static com.blackberry.jwteditor.utils.JSONUtils.isJsonCompact;
 import static com.blackberry.jwteditor.utils.JSONUtils.prettyPrintJSON;
+import static com.blackberry.jwteditor.view.dialog.operations.SignDialog.Mode.EMBED_JWK;
 
 /**
  * Presenter class for the Editor tab
@@ -54,7 +55,7 @@ public class EditorPresenter {
     private final KeysRepository keysRepository;
     private final EditorView view;
     private final CollaboratorPayloadGenerator collaboratorPayloadGenerator;
-    private final ErrorLoggingActionListenerFactory actionListenerFactory;
+    private final Logging logging;
     private final MessageDialogFactory messageDialogFactory;
     private final EditorModel model;
 
@@ -63,11 +64,11 @@ public class EditorPresenter {
     public EditorPresenter(
             EditorView view,
             CollaboratorPayloadGenerator collaboratorPayloadGenerator,
-            ErrorLoggingActionListenerFactory actionListenerFactory,
+            Logging logging,
             KeysRepository keysRepository) {
         this.view = view;
         this.collaboratorPayloadGenerator = collaboratorPayloadGenerator;
-        this.actionListenerFactory = actionListenerFactory;
+        this.logging = logging;
         this.keysRepository = keysRepository;
         this.model = new EditorModel();
         this.messageDialogFactory = new MessageDialogFactory(view.uiComponent());
@@ -188,7 +189,7 @@ private JWE getJWE() {
      * Handle clicks events from the Embedded JWK Attack button
      */
     public void onAttackEmbedJWKClicked() {
-        signingDialog(SignDialog.Mode.EMBED_JWK);
+        signingDialog(EMBED_JWK);
     }
 
     /**
@@ -210,78 +211,45 @@ public void onAttackKeyConfusionClicked() {
             return;
         }
 
-        // Create the key confusion attack dialog with the JWS currently in the editor fields
-        KeyConfusionAttackDialog keyConfusionAttackDialog = new KeyConfusionAttackDialog(
+        OperationDialog<JWS> dialog = new KeyConfusionAttackDialog(
                 view.window(),
-                actionListenerFactory,
+                logging,
                 verificationKeys,
                 getJWS()
         );
-        keyConfusionAttackDialog.display();
 
-        // Set the result as the JWS in the editor if the attack succeeds
-        JWS signedJWS = keyConfusionAttackDialog.getJWS();
-        if (signedJWS != null) {
-            setJWS(signedJWS);
-        }
+        showDialogAndUpdateJWS(dialog);
     }
 
-    /**
-     * Handle clicks events from the none Signing algorithm button
-     */
     public void onAttackSignNoneClicked() {
-        // Get the JWS from the editor, strip the signature and set the editor to the new JWS
-        NoneDialog noneDialog = new NoneDialog(view.window(), getJWS());
-        noneDialog.display();
+        OperationDialog<JWS> dialog = new NoneDialog(view.window(), logging, getJWS());
 
-        JWS unsignedJWS = noneDialog.getJWS();
-
-        if (unsignedJWS != null) {
-            setJWS(unsignedJWS);
-        }
+        showDialogAndUpdateJWS(dialog);
     }
 
     public void onAttackSignEmptyKeyClicked() {
-        EmptyKeySigningDialog signingDialog = new EmptyKeySigningDialog(view.window(), actionListenerFactory, getJWS());
-        signingDialog.display();
-
-        JWS signedJWS = signingDialog.getJWS();
+        OperationDialog<JWS> dialog = new EmptyKeySigningDialog(view.window(), logging, getJWS());
 
-        if (signedJWS != null) {
-            setJWS(signedJWS);
-        }
+        showDialogAndUpdateJWS(dialog);
     }
 
     public void onAttackPsychicSignatureClicked() {
-        PsychicSignatureDialog signingDialog = new PsychicSignatureDialog(view.window(), getJWS());
-        signingDialog.display();
-
-        JWS signedJWS = signingDialog.getJWS();
+        OperationDialog<JWS> dialog = new PsychicSignatureDialog(view.window(), logging, getJWS());
 
-        if (signedJWS != null) {
-            setJWS(signedJWS);
-        }
+        showDialogAndUpdateJWS(dialog);
     }
 
     public void onAttackEmbedCollaboratorPayloadClicked() {
-        EmbedCollaboratorPayloadDialog collaboratorPayloadDialog = new EmbedCollaboratorPayloadDialog(
+        OperationDialog<JWS> dialog = new EmbedCollaboratorPayloadDialog(
                 view.window(),
+                logging,
                 getJWS(),
                 collaboratorPayloadGenerator
         );
 
-        collaboratorPayloadDialog.display();
-
-        JWS updatedJWS = collaboratorPayloadDialog.getJWS();
-
-        if (updatedJWS != null) {
-            setJWS(updatedJWS);
-        }
+        showDialogAndUpdateJWS(dialog);
     }
 
-    /**
-     * Handle click events from the Sign button
-     */
     public void onSignClicked() {
         signingDialog(SignDialog.Mode.NORMAL);
     }
@@ -298,19 +266,24 @@ private void signingDialog(SignDialog.Mode mode) {
             return;
         }
 
-        SignDialog signDialog = new SignDialog(
+        OperationDialog<JWS> signDialog = new SignDialog(
                 view.window(),
-                actionListenerFactory,
+                logging,
                 keysRepository.getSigningKeys(),
                 getJWS(),
                 mode
         );
-        signDialog.display();
 
-        // If a JWS was created by the dialog, replace the contents of the editor
-        JWS signedJWS = signDialog.getJWS();
-        if (signedJWS != null) {
-            setJWS(signedJWS);
+        showDialogAndUpdateJWS(signDialog);
+    }
+
+    private void showDialogAndUpdateJWS(OperationDialog<JWS> dialog) {
+        dialog.display();
+
+        JWS updatedJWS = dialog.getJWT();
+
+        if (updatedJWS != null) {
+            setJWS(updatedJWS);
         }
     }
 
@@ -342,16 +315,16 @@ public void onEncryptClicked() {
             return;
         }
 
-        EncryptDialog encryptDialog = new EncryptDialog(
+        OperationDialog<JWE> encryptDialog = new EncryptDialog(
                 view.window(),
-                actionListenerFactory,
+                logging,
                 getJWS(),
                 keysRepository.getEncryptionKeys()
         );
         encryptDialog.display();
 
         // If a JWE was created by the dialog, replace the contents of the editor and change to JWE mode
-        JWE jwe = encryptDialog.getJWE();
+        JWE jwe = encryptDialog.getJWT();
 
         if (jwe != null) {
             view.setMode(EditorMode.JWE);

src/main/java/com/blackberry/jwteditor/view/dialog/operations/EmbedCollaboratorPayloadDialog.java

@@ -19,18 +19,17 @@
 package com.blackberry.jwteditor.view.dialog.operations;
 
 import burp.api.montoya.collaborator.CollaboratorPayloadGenerator;
+import burp.api.montoya.logging.Logging;
 import com.blackberry.jwteditor.model.jose.JWS;
 import com.blackberry.jwteditor.operations.Attacks;
-import com.blackberry.jwteditor.view.dialog.AbstractDialog;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.KeyEvent;
 
 import static com.nimbusds.jose.HeaderParameterNames.JWK_SET_URL;
 import static com.nimbusds.jose.HeaderParameterNames.X_509_CERT_URL;
 
-public class EmbedCollaboratorPayloadDialog extends AbstractDialog {
+public class EmbedCollaboratorPayloadDialog extends OperationDialog<JWS> {
     private static final String[] HEADER_LOCATION_VALUES = {JWK_SET_URL, X_509_CERT_URL};
 
     private final CollaboratorPayloadGenerator collaboratorPayloadGenerator;
@@ -39,43 +38,25 @@ public class EmbedCollaboratorPayloadDialog extends AbstractDialog {
     private JButton buttonOK;
     private JButton buttonCancel;
     private JComboBox<String> comboBoxAlgorithm;
-    private JWS jws;
 
-    public EmbedCollaboratorPayloadDialog(Window parent, JWS jws, CollaboratorPayloadGenerator collaboratorPayloadGenerator) {
-        super(parent, "embed_collaborator_payload_attack_dialog_title");
-        this.jws = jws;
+    public EmbedCollaboratorPayloadDialog(Window parent, Logging logging, JWS jws, CollaboratorPayloadGenerator collaboratorPayloadGenerator) {
+        super(parent, logging, "embed_collaborator_payload_attack_dialog_title", jws);
         this.collaboratorPayloadGenerator = collaboratorPayloadGenerator;
 
-        setContentPane(contentPane);
-        getRootPane().setDefaultButton(buttonOK);
-
-        buttonOK.addActionListener(e -> onOK());
-        buttonCancel.addActionListener(e -> onCancel());
-
-        // call onCancel() on ESCAPE
-        contentPane.registerKeyboardAction(
-                e -> onCancel(),
-                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
-        );
+        configureUI(contentPane, buttonOK, buttonCancel);
 
         comboBoxAlgorithm.setModel(new DefaultComboBoxModel<>(HEADER_LOCATION_VALUES));
         comboBoxAlgorithm.setSelectedIndex(0);
     }
 
-    public JWS getJWS() {
-        return jws;
-    }
-
-    private void onOK() {
+    @Override
+    JWS performOperation() {
         String selectedLocation = (String) comboBoxAlgorithm.getSelectedItem();
 
-        jws = Attacks.embedCollaboratorPayload(
-                jws,
+        return Attacks.embedCollaboratorPayload(
+                jwt,
                 selectedLocation,
                 collaboratorPayloadGenerator.generatePayload().toString()
         );
-
-        dispose();
     }
 }