From e44c8f2a3eb1ba67332dde3d135912f4564e3423 Mon Sep 17 00:00:00 2001
From: Carlos Ortiz <chrono.dark@gmail.com>
Date: Tue, 10 Sep 2024 22:10:58 -0600
Subject: [PATCH] Add import certificate action and toolbar enhancement

Introduced a new toolbar action for importing certificates into JKS files. Updated `CertificateHelper` and related UI components to support the new import functionality. Adjusted project settings to use JDK 20.
---
 .idea/gradle.xml                              |  2 +
 .idea/misc.xml                                |  2 +-
 .idea/workspace.xml                           | 31 +++-----
 .../com/jmpeax/ssltoolbox/jks/JKSView.java    | 76 +++++++++++--------
 .../ssltoolbox/jks/actions/ImportCert.java    | 51 +++++++++++++
 .../ssltoolbox/svc/CertificateHelper.java     |  3 +
 src/main/resources/META-INF/plugin.xml        | 13 ++++
 7 files changed, 128 insertions(+), 50 deletions(-)
 create mode 100644 src/main/java/com/jmpeax/ssltoolbox/jks/actions/ImportCert.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce1c62c..bb02656 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="temurin-20" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -12,5 +13,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="parallelModelFetch" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2758df8..eda6f86 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" project-jdk-name="temurin-20" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f339e7..7fff9f6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="59d96402-7939-4683-88ee-f288879280eb" name="Changes" comment="Enhance JKSView with UI improvements and functionality updates&#10;&#10;Added a final `DefaultListModel` for certificate alias management and `Map` for X509 certificates. Modified UI elements for improved user interaction, including updated panel borders and more efficient toolbar layout. Introduced a file chooser dialog for importing certificates, along with robust logging for tracking selected file details.">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/jmpeax/ssltoolbox/jks/actions/ImportCert.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/META-INF/plugin.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/META-INF/plugin.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,22 +40,6 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="ssl-toolbox" type="f1a62948:ProjectNode" />
               </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="ssl-toolbox" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="ssl-toolbox" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="intellij" type="c8890929:TasksNode$1" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="ssl-toolbox" type="f1a62948:ProjectNode" />
-                <item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
-              </path>
             </expand>
             <select />
           </tree_state>
@@ -97,12 +87,13 @@
     &quot;Gradle.Keytool [signPlugin].executor&quot;: &quot;Run&quot;,
     &quot;Gradle.Run Plugin.executor&quot;: &quot;Run&quot;,
     &quot;Gradle.keytoolj [setupDependencies].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ssl-toolbox [publishPlugin].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.ssl-toolbox [publishPlugin].executor&quot;: &quot;Debug&quot;,
     &quot;Gradle.ssl-toolbox [setupDependencies].executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;UI_DESIGNER_EDITOR_MODE.PaletteManager.SHOW&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;/Users/cortiz/repos/jmpeax/ssl-toolbox/.github/workflows&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
@@ -110,7 +101,7 @@
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.grazie.pro&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
@@ -197,8 +188,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.Keytool [signPlugin]" />
         <item itemvalue="Gradle.ssl-toolbox [publishPlugin]" />
+        <item itemvalue="Gradle.Keytool [signPlugin]" />
       </list>
     </recent_temporary>
   </component>
@@ -237,6 +228,8 @@
       <workItem from="1725580455015" duration="27000" />
       <workItem from="1725580838602" duration="7806000" />
       <workItem from="1725629468371" duration="1748000" />
+      <workItem from="1726021091460" duration="3490000" />
+      <workItem from="1726027186782" duration="634000" />
     </task>
     <task id="LOCAL-00001" summary="Rename packages for SSL Toolbox rebranding&#10;&#10;Refactor all package names from &quot;com.jmpeax.keytoolj&quot; to &quot;com.jmpeax.ssltoolbox&quot;. This change aligns with the rebranding effort from Keytoolj to SSL Toolbox, altering references in Java files and project configurations.">
       <option name="closed" value="true" />
diff --git a/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java b/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java
index f1460c4..db522f4 100644
--- a/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java
+++ b/src/main/java/com/jmpeax/ssltoolbox/jks/JKSView.java
@@ -1,8 +1,13 @@
 package com.jmpeax.ssltoolbox.jks;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionGroup;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionToolbar;
+import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBLabel;
@@ -152,44 +157,55 @@ private JPanel createUnlockButton() {
     }
 
     private JPanel buildToolBar() {
+        ActionGroup actionGroup = (ActionGroup) ActionManager.getInstance().getAction("JKS-Actions");
+        ActionToolbar actionToolBar = ActionManager.getInstance().createActionToolbar("JKS-Actions-Toolbar", actionGroup, true);
+        actionToolBar.setTargetComponent(this);
+
+        DataContext dataContext = dataId -> this.file;
+        actionToolBar.getComponent().putClientProperty(DataContext.class, dataContext);
+
         JPanel panel = new JPanel(new GridLayout(1,1));
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.insets = JBUI.insets(5);
         gbc.fill = GridBagConstraints.NONE;
         gbc.anchor = GridBagConstraints.WEST;
-
-        JButton openButton = new JButton(AllIcons.ToolbarDecorator.Import);
-        openButton.setToolTipText("Open");
-        openButton.setPreferredSize(new Dimension(AllIcons.ToolbarDecorator.Import.getIconWidth() + 10, AllIcons.ToolbarDecorator.Import.getIconHeight() + 10));
-        openButton.setBorderPainted(false);
-        openButton.addActionListener(e -> {
-            var descriptor = new FileChooserDescriptor(
-                    true,  // Choose Files
-                    false,
-                    false,
-                    false,
-                    false,
-                    false
-            );
-            VirtualFile file = FileChooser.chooseFile(descriptor, null, null);
-            if (file != null) {
-                var str = Messages.showInputDialog("Enter Alias for " + file.getName(), "Alias for Imported Certificate", null);
-                LoggerFactory.getLogger(JKSView.class).info("Selected file: alias {} {}", str, file.getPath());
-                this.listModel.addElement(str);
-            }
-        });
         gbc.gridx = 0;
         gbc.gridy = 0;
-        panel.add(openButton, gbc);
-        JButton saveButton = new JButton(AllIcons.ToolbarDecorator.Export);
-        saveButton.setPreferredSize(new Dimension(AllIcons.ToolbarDecorator.Export.getIconWidth() + 10, AllIcons.ToolbarDecorator.Export.getIconHeight() + 10));
-        saveButton.setToolTipText("Save");
-        saveButton.addActionListener(e -> {
-        });
-        gbc.gridx = 1;
-        panel.add(saveButton, gbc);
-
+        panel.add(actionToolBar.getComponent(), gbc);
         return panel;
+//
+//        JButton openButton = new JButton(AllIcons.ToolbarDecorator.Import);
+//        openButton.setToolTipText("Open");
+//        openButton.setPreferredSize(new Dimension(AllIcons.ToolbarDecorator.Import.getIconWidth() + 10, AllIcons.ToolbarDecorator.Import.getIconHeight() + 10));
+//        openButton.setBorderPainted(false);
+//        openButton.addActionListener(e -> {
+//            var descriptor = new FileChooserDescriptor(
+//                    true,  // Choose Files
+//                    false,
+//                    false,
+//                    false,
+//                    false,
+//                    false
+//            );
+//            VirtualFile file = FileChooser.chooseFile(descriptor, null, null);
+//            if (file != null) {
+//                var str = Messages.showInputDialog("Enter Alias for " + file.getName(), "Alias for Imported Certificate", null);
+//                LoggerFactory.getLogger(JKSView.class).info("Selected file: alias {} {}", str, file.getPath());
+//                this.listModel.addElement(str);
+//            }
+//        });
+//        gbc.gridx = 0;
+//        gbc.gridy = 0;
+//        panel.add(openButton, gbc);
+//        JButton saveButton = new JButton(AllIcons.ToolbarDecorator.Export);
+//        saveButton.setPreferredSize(new Dimension(AllIcons.ToolbarDecorator.Export.getIconWidth() + 10, AllIcons.ToolbarDecorator.Export.getIconHeight() + 10));
+//        saveButton.setToolTipText("Save");
+//        saveButton.addActionListener(e -> {
+//        });
+//        gbc.gridx = 1;
+//        panel.add(saveButton, gbc);
+//
+//        return panel;
     }
 
     private void updateView(Map<String, X509Certificate> certs) {
diff --git a/src/main/java/com/jmpeax/ssltoolbox/jks/actions/ImportCert.java b/src/main/java/com/jmpeax/ssltoolbox/jks/actions/ImportCert.java
new file mode 100644
index 0000000..b4654b9
--- /dev/null
+++ b/src/main/java/com/jmpeax/ssltoolbox/jks/actions/ImportCert.java
@@ -0,0 +1,51 @@
+package com.jmpeax.ssltoolbox.jks.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileChooser.FileChooser;
+import com.intellij.openapi.fileChooser.FileChooserDescriptor;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.jmpeax.ssltoolbox.svc.CertificateHelper;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+
+public class ImportCert extends AnAction {
+
+    private static final Logger LOGGER = Logger.getInstance(ImportCert.class);
+
+    @Override
+    public void actionPerformed(@NotNull AnActionEvent e) {
+        try {
+            var f = e.getData(CommonDataKeys.VIRTUAL_FILE);
+            if (f == null) {
+                LOGGER.warn("JKS not send to the Action");
+                return;
+            }
+            var descriptor = new FileChooserDescriptor(
+                    true,  // Choose Files
+                    false,
+                    false,
+                    false,
+                    false,
+                    false
+            );
+            VirtualFile file = FileChooser.chooseFile(descriptor, null, null);
+            if (file == null) {
+                LOGGER.warn("User did not select a certificate");
+                return;
+            }
+            Messages.showInputDialog("Cert alias","Certificate Alias", Messages.getQuestionIcon());
+            var pwd = Messages.showPasswordDialog("Keystore password", "KeyStore Password");
+            if (pwd != null && !pwd.isBlank()) {
+                CertificateHelper.importCertificate(f.getInputStream(), file.getInputStream(), pwd.toCharArray());
+            }
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}
diff --git a/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java b/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java
index 9f73c95..3f8cf5f 100644
--- a/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java
+++ b/src/main/java/com/jmpeax/ssltoolbox/svc/CertificateHelper.java
@@ -109,4 +109,7 @@ public static Map<String,X509Certificate> getKeyStoreCerts(InputStream keystoreI
         return certs;
     }
 
+    public static void importCertificate(@NotNull InputStream inputStream, @NotNull InputStream inputStream1, char[] charArray) {
+
+    }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d1b4c37..ed92e04 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -55,4 +55,17 @@
         <fileEditorProvider implementation="com.jmpeax.ssltoolbox.jks.JKSFileEditorProvider" />
         <fileType name="JKS file" implementationClass="com.jmpeax.ssltoolbox.jks.JKSFileType" extensions="jks;p12"/>
     </extensions>
+
+    <actions>
+
+        <group id="JKS-Actions"
+               text="JKS Actions" description="JKS actions"
+               popup="true" icon="AllIcons.Ide.ConfigFile">
+            <action id="import-cert-jks" class="com.jmpeax.ssltoolbox.jks.actions.ImportCert"
+                    text="Import" description="Import certificate"
+                    icon="AllIcons.Actions.Refresh">
+            </action>
+        </group>
+
+    </actions>
 </idea-plugin>
\ No newline at end of file