Merge branch 'tkt_22_add_create_workspace' into 'develop'

Add create workspace

Closes #22

See merge request faradaysec/faraday-burp!8

CHANGELOG.md

@@ -1,6 +1,10 @@
+# v2.8.1 - 2022/10/28
+
+* Add create workspace button
+
 # v2.8 - 2022/09/19
 
-* Add refresh workspace bottom
+* Add refresh workspace button
 * Fix website field
 * Now the host,services and vulns create have a command associated
 

src/main/java/burp/faraday/FaradayConnector.java

@@ -366,6 +366,34 @@ void setCurrentWorkspace(Workspace currentWorkspace) {
         this.currentWorkspace = currentWorkspace;
     }
 
+    /**
+     * Create a new workspace.
+     *
+     * @param name The workspace to name.
+     */
+    public Workspace createWorkspace(final String name)
+            throws InvalidFaradayServerException,
+            ObjectNotCreatedException {
+        if (!this.urlIsValid) {
+            throw new InvalidFaradayServerException();
+        }
+        try {
+            try {
+                Workspace ws = new Workspace();
+                ws.setName(name);
+                ws.setActive(true);
+                return faradayServerAPI.createWorkspace(ws);
+            } catch (ConflictException e) {
+                throw new ObjectNotCreatedException();
+            }
+        } catch (UnauthorizedException e) {
+            throw new ObjectNotCreatedException();
+        } catch (Exception e)
+        {
+            throw new ObjectNotCreatedException();
+        }
+    }
+
     /**
      * Adds a vulnerability to the current workspace.
      *

src/main/java/burp/faraday/FaradayExtensionUI.java

@@ -36,6 +36,7 @@ public class FaradayExtensionUI implements ITab {
     private JTextField usernameText;
     private JPasswordField passwordField;
     private JTextField secondFactorField;
+    private JTextField newWorkspaceText;
     private JButton statusButton;
     private JCheckBox ignoreSSLErrorsCheckbox;
     private JLabel placeHolderLabel;
@@ -54,6 +55,7 @@ public class FaradayExtensionUI implements ITab {
     private Component settingsPannel;
     private Component otherSettingsPanel;
     private Component statusPanel;
+    private Component newWorkspacePanel;
     private Component messagesPanel;
     private HashMap<Integer, Integer> commandsMap = null;
 
@@ -78,6 +80,7 @@ public FaradayExtensionUI(PrintWriter stdout, IBurpExtenderCallbacks callbacks,
         this.settingsPannel = setupSettingsPanel();
         this.otherSettingsPanel = setupOtherSettingsPanel();
         this.statusPanel = setupStatusPanel();
+        this.newWorkspacePanel  = setupNewWorkspacePanel();
         this.messagesPanel = setupMessagesPanel();
 
         layout.setHorizontalGroup(
@@ -87,6 +90,7 @@ public FaradayExtensionUI(PrintWriter stdout, IBurpExtenderCallbacks callbacks,
                                 .addComponent(settingsPannel)
                                 .addComponent(otherSettingsPanel)
                                 .addComponent(statusPanel)
+                                .addComponent(newWorkspacePanel)
                         )
                         .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
                                 .addComponent(messagesPanel)
@@ -102,6 +106,7 @@ public FaradayExtensionUI(PrintWriter stdout, IBurpExtenderCallbacks callbacks,
                                 .addGroup(layout.createSequentialGroup()
                                         .addComponent(loginPanel)
                                         .addComponent(settingsPannel)
+                                        .addComponent(newWorkspacePanel)
                                         .addComponent(otherSettingsPanel)
                                         .addComponent(statusPanel)
                                 )
@@ -252,10 +257,9 @@ private Component setupSettingsPanel() {
                         .addComponent(inScopeCheckbox)
                         .addComponent(importCurrentVulnsButton)
                         .addComponent(refreshWorkspaces)
-
                 )
                 .addGroup(layout.createParallelGroup()
-                    .addComponent(componentsSeparator)
+                        .addComponent(componentsSeparator)
                 )
                 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
                         .addComponent(workspaceLabel)
@@ -310,13 +314,55 @@ private Component setupOtherSettingsPanel() {
         return otherSettingsPanel;
     }
 
+    private Component setupNewWorkspacePanel() {
+        JPanel newWorkspacePanet = new JPanel();
+        newWorkspacePanet.setBorder(BorderFactory.createTitledBorder("New Workspace"));
+
+        JLabel newWorkspaceLabel = new JLabel("Name: ");
+        newWorkspaceText = new JTextField();
+        JButton createNewWorkspaceButton = new JButton("Create");
+        createNewWorkspaceButton.addActionListener(actionEvent -> createWorkspace());
+
+        GroupLayout layout = new GroupLayout(newWorkspacePanet);
+        layout.setAutoCreateGaps(true);
+        layout.setAutoCreateContainerGaps(true);
+
+        newWorkspacePanet.setLayout(layout);
+
+        layout.setHorizontalGroup(
+                layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER)
+                                .addComponent(newWorkspaceLabel)
+                        )
+                        .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER)
+                                .addComponent(newWorkspaceText, 256, 256, 256)
+                        )
+                        .addComponent(createNewWorkspaceButton)
+
+        );
+
+        layout.setVerticalGroup(
+                layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER)
+                                .addComponent(newWorkspaceLabel)
+                                .addComponent(newWorkspaceText)
+                                .addComponent(createNewWorkspaceButton)
+                        )
+        );
+
+        layout.linkSize(SwingConstants.VERTICAL, newWorkspaceText);
+        layout.linkSize(SwingConstants.HORIZONTAL, newWorkspaceText);
+
+
+        return newWorkspacePanet;
+    }
+
     private Component setupStatusPanel() {
         JPanel statusPanet = new JPanel();
         statusPanet.setBorder(BorderFactory.createTitledBorder("Status"));
 
         statusLabel = new JLabel("...");
 
-
         GroupLayout layout = new GroupLayout(statusPanet);
         layout.setAutoCreateGaps(true);
         layout.setAutoCreateContainerGaps(true);
@@ -608,6 +654,26 @@ private void loadWorkspaces() {
         }
     }
 
+    /**
+     * Create a new workspace
+     @param workspace The name of the new workspace.
+     */
+    private void createWorkspace() {
+        String workspaceName = newWorkspaceText.getText().trim();
+        newWorkspaceText.setText("");
+        try {
+            Workspace newWorkspace = faradayConnector.createWorkspace(workspaceName);
+            extensionSettings.setCurrentWorkspace(workspaceName);
+            loadWorkspaces();
+            log("New workspace created: " + workspaceName);
+        } catch (InvalidFaradayServerException e) {
+            log("Could not create workspace: " + e);
+        }catch (ObjectNotCreatedException e) {
+            log("Unable to create object workspace: " + e);
+            return;
+        }
+    }
+
     /**
      * Callback for when a workspace is selected on the extension settings
      *

src/main/java/burp/faraday/FaradayServerAPI.java

@@ -83,6 +83,17 @@ public interface FaradayServerAPI {
     @Headers("Content-Type: application/json")
     List<Workspace> getWorkspaces() throws UnauthorizedException;
 
+    /**
+     * Create a workspace.
+     *
+     * @return A Workspace Object
+     *
+     * @throws UnauthorizedException If the session has expired.
+     */
+    @RequestLine("POST /_api/v3/ws")
+    @Headers("Content-Type: application/json")
+    Workspace createWorkspace(Workspace workspace) throws UnauthorizedException, ConflictException;
+
     /**
      * Creates a command in the specified workspace.
      *