fix: fix correct checking/unlocking radicle identity

Author: JChrist

jrad/src/lib.rs

@@ -104,6 +104,12 @@ pub extern "system" fn issueCommentReact(inp: *const c_char) -> *const c_char {
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug)]
+struct BaseProfileInfo {
+    home: Option<String>,
+    passphrase: Option<String>,
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug)]
 struct ChangeIssueTitleDesc {
     repo_id: RepoId,
@@ -371,6 +377,14 @@ pub fn resolve_embed(repo: &Repository, embed: ContentEmbed) -> Result<Embed<Uri
 fn read_input(input: *const c_char) -> Result<String, anyhow::Error> {
     let input_str = unsafe { std::ffi::CStr::from_ptr(input) };
     let input_string = input_str.to_str()?;
+    let base_info: BaseProfileInfo = serde_json::from_str(input_string)?;
+    if base_info.home.is_some() {
+        std::env::set_var("RAD_HOME", base_info.home.unwrap());
+    }
+    if base_info.passphrase.is_some() {
+        std::env::set_var("RAD_PASSPHRASE", base_info.passphrase.unwrap());
+    }
+
     Ok(String::from(input_string))
 }
 

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/actions/rad/RadAction.java

@@ -92,52 +92,61 @@ private RadicleProjectSettings getProjectSettings() {
         return projectHandler.loadSettings();
     }
 
+
     private ProcessOutput unlockIdentity(String radHome, String radPath, IdentityDialog dialog) {
         if (project == null && repo == null) {
             return new ProcessOutput(0);
         }
         var pr = project != null ? project : repo.getProject();
-        var output = rad.self(radHome, radPath);
-        var lines = output.getStdoutLines(true);
+        final var idOutput = rad.self(radHome, radPath);
+        final var hasIdentity = RadAction.isSuccess(idOutput);
+        var lines = idOutput.getStdoutLines(true);
         var radDetails = new RadDetails(lines);
-        var isIdentityUnlocked = rad.isIdentityUnlocked(radDetails.keyHash);
-        var hasIdentity = RadAction.isSuccess(output);
-        var projectSettings = new RadicleProjectSettingsHandler(pr);
+        final var isIdentityUnlocked = rad.isIdentityUnlocked(radDetails.keyHash);
+        if (isIdentityUnlocked) {
+            return new ProcessOutput(0);
+        }
+        final var projectSettings = new RadicleProjectSettingsHandler(pr);
         String storedPassword =  null;
         if (hasIdentity) {
+            // check if key has no passphrase
+            var ok = rad.isPassphraseCorrect("", radHome);
+            if (ok) {
+                projectSettings.savePassphrase(radDetails.nodeId, "");
+                rad.auth("", "", radHome, radPath);
+                return new ProcessOutput(0);
+            }
+            // the key has a non-empty passphrase, check if we have saved a password
             storedPassword = projectSettings.getPassword(radDetails.nodeId);
         }
-        var hasStoredPassword = storedPassword != null;
-        var showDialog = ((!hasIdentity || !isIdentityUnlocked) && !hasStoredPassword);
-        IdentityDialog.IdentityDialogData dialogData = null;
-        if (showDialog) {
-            var authService = project.getService(AuthService.class);
-            var title = !hasIdentity ? RadicleBundle.message("newIdentity") :
-                    RadicleBundle.message("unlockIdentity");
-            dialogData = authService.showIdentityDialog(title, hasIdentity, dialog);
+        final var hasStoredPassword = storedPassword != null;
+        boolean hasCorrectStoredPassword = hasStoredPassword;
+        if (hasIdentity && hasStoredPassword) {
+            hasCorrectStoredPassword = rad.isPassphraseCorrect(storedPassword, radHome);
         }
-        if (!isIdentityUnlocked && hasIdentity && hasStoredPassword) {
-            var authOutput = rad.auth(storedPassword, "", radHome, radPath);
-            var success = RadAuth.validateOutput(authOutput);
-            if (!RadAction.isSuccess(success)) {
-                projectSettings.savePassphrase(radDetails.nodeId, null);
-            }
-            return success;
+        var showDialog = !hasIdentity || !hasStoredPassword || !hasCorrectStoredPassword;
+        if (!showDialog) {
+            // attempt to unlock identity (add key to ssh-agent)
+            rad.auth(storedPassword, "", radHome, radPath);
+            return new ProcessOutput(0);
         }
-        if (dialogData != null) {
-              var authOutput = rad.auth(dialogData.passphrase(), dialogData.alias(), radHome, radPath);
-              var success = RadAuth.validateOutput(authOutput);
-              if (RadAction.isSuccess(success)) {
-                  output = rad.self(radHome, radPath);
-                  lines = output.getStdoutLines(true);
-                  radDetails = new RadDetails(lines);
-                  projectSettings.savePassphrase(radDetails.nodeId, dialogData.passphrase());
-              }
-              return success;
+        var authService = project.getService(AuthService.class);
+        var title = !hasIdentity ? RadicleBundle.message("newIdentity") : RadicleBundle.message("unlockIdentity");
+        final var dialogData = authService.showIdentityDialog(title, hasIdentity, dialog);
+        if (hasIdentity) {
+            // we already had an identity, so check the passphrase again
+            hasCorrectStoredPassword = rad.isPassphraseCorrect(dialogData.passphrase(), radHome);
+            if (!hasCorrectStoredPassword) {
+                return new ProcessOutput(-1);
+            }
         }
-        var newOutput = new ProcessOutput(showDialog ? -1 : 0);
-        newOutput.appendStderr(RadicleBundle.message("unableToUnlock"));
-        return newOutput;
+        // either create the new identity, or attempt to unlock the existing one
+        rad.auth(dialogData.passphrase(), dialogData.alias(), radHome, radPath);
+        var output = rad.self(radHome, radPath);
+        lines = output.getStdoutLines(true);
+        radDetails = new RadDetails(lines);
+        projectSettings.savePassphrase(radDetails.nodeId, dialogData.passphrase());
+        return new ProcessOutput(0);
     }
 
     public ProcessOutput perform(CountDownLatch latch, String radHome, String radPath, IdentityDialog dialog) {
@@ -292,6 +301,18 @@ public static boolean isSuccess(ProcessOutput out) {
         return !out.isTimeout() && !out.isCancelled() && out.getExitCode() == 0;
     }
 
+    public static ProcessOutput validateAuthOutput(ProcessOutput output) {
+        /* rad auth return success exit code (0) and a failed msg if the password is wrong */
+        var isSuccess = RadAction.isSuccess(output) && !output.getStdout().contains("failed") &&
+                !output.getStdout().contains("Nothing to do, ssh-agent is not running.");
+        var pr = new ProcessOutput(isSuccess ? 0 : -1);
+        /* Write from stdOut to stdErr in order to appear the message in the notification */
+        var stdOut = output.getStdout();
+        var errorMessage = !Strings.isNullOrEmpty(stdOut) ? stdOut : RadicleBundle.message("radCliError");
+        pr.appendStderr(errorMessage);
+        return pr;
+    }
+
     public static class ConfigureRadCliNotificationAction extends NotificationAction {
         final Project project;
 

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/actions/rad/RadAuth.java

@@ -2,8 +2,8 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
+import com.intellij.execution.CommandLineUtil;
 import com.intellij.execution.configurations.GeneralCommandLine;
-import com.intellij.execution.util.ExecUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import network.radicle.jetbrains.radiclejetbrainsplugin.config.RadicleProjectSettingsHandler;
@@ -104,7 +104,7 @@ private String getExportRadPassphrase() {
         if (Strings.isNullOrEmpty(password)) {
             return "";
         }
-        return "export RAD_PASSPHRASE=" + ExecUtil.escapeUnixShellArgument(password);
+        return "export RAD_PASSPHRASE=" + CommandLineUtil.posixQuote(password);
     }
 
     private String getRandomScriptName() {

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/commands/RadicleScriptCommand.java

@@ -119,15 +119,18 @@ private void unlockOrCreateIdentity() {
             var radHome = getPathFromTextField(radHomeField);
             var radPath = getPathFromTextField(radPathField);
             var radSelf = new RadSelf(radHome, radPath, myProject);
-            var output = radSelf.perform(radHome, radPath, dialog);
+            final var output = radSelf.perform(radHome, radPath, dialog);
             var lines = output.getStdoutLines(true);
             radDetails = new RadDetails(lines);
-            logger.debug("got rad details: {}", radDetails.did);
             var cli = myProject.getService(RadicleCliService.class);
             if (cli != null) {
                 cli.resetIdentity();
             }
             myLatch.countDown();
+            if (!RadAction.isSuccess(output)) {
+                ApplicationManager.getApplication().invokeLater(() -> this.msgLabel.setText(RadicleBundle.message("unableToUnlock")), ModalityState.any());
+                return;
+            }
             // check if rad home is non-default
             if (Strings.isNullOrEmpty(autoDetectRadHome.detected)) {
                 autoDetectRadHome.detect();

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/config/RadicleSettingsView.java

@@ -118,7 +118,7 @@ public JComponent createCommentSection(List<RadDiscussion> discussionList) {
             }
             var panel = new BorderLayoutPanel();
             panel.setOpaque(false);
-            var editorPane = new MarkDownEditorPaneFactory(message, radIssue.project, radIssue.projectId, file);
+            var editorPane = new MarkDownEditorPaneFactory(message, radIssue.project, radIssue.projectId, file, panel);
             panel.addToCenter(StatusMessageComponentFactory.INSTANCE.create(editorPane.htmlEditorPane(), StatusMessageType.WARNING));
             emojiPanel = new IssueEmojiPanel(issueModel, com.reactions, com.id, radDetails);
             var verticalPanel = getVerticalPanel(5);
@@ -173,8 +173,7 @@ public boolean createComment(DragAndDropField field) {
 
     private JComponent getDescription() {
         var bodyIssue = radIssue.getDescription();
-        var editorPane = new MarkDownEditorPaneFactory(bodyIssue, radIssue.project, radIssue.projectId, file);
-        descPanel = Utils.descriptionPanel(editorPane, radIssue.project, "issue.change.description", f -> {
+        descPanel = Utils.descriptionPanel(bodyIssue, radIssue.project, radIssue.projectId, file, "issue.change.description", f -> {
             var newDesc = f.getText();
             if (Strings.isNullOrEmpty(newDesc)) {
                 return false;

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/issues/overview/IssueComponent.java

@@ -134,7 +134,7 @@ private void updateCommitFileComponents(LinkLabel<?> fromLabel, JLabel toLabel)
         ApplicationManager.getApplication().executeOnPooledThread(() -> {
             //Start loading indicator
             progressStripe.startLoading();
-            //Get project information from httpd
+            //Get project information
             projectInfo = getProjectInfo(mySelectedRepo);
             if (projectInfo == null) {
                 return;
@@ -305,7 +305,8 @@ private void createPatch() {
                     RadicleBundle.message("findRemoteErrorDesc"));
             return;
         }
-        ApplicationManager.getApplication().executeOnPooledThread(() -> {
+        // execute in background via rad, so that the jobs get assigned a progress indicator and ij stops throwing useless errors
+        radicleProjectService.executeInBackground(() -> {
             newPatchButton.setEnabled(false);
             loadingPanel.setVisible(true);
             var cli = project.getService(RadicleCliService.class);

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/CreatePatchPanel.java

@@ -4,6 +4,7 @@
 import com.intellij.collaboration.ui.codereview.commits.CommitsBrowserComponentBuilder;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.VcsException;
@@ -98,7 +99,7 @@ public JComponent createCommitComponent() {
     }
 
     public void updateFileAndCommitComponents(GitRepository repo, String revNumber, String mainBranchHead, int retriesAttempt) {
-        ApplicationManager.getApplication().executeOnPooledThread(() -> {
+        radicleProjectService.executeInBackground(() -> {
             try {
                 var changes = calculatePatchCommits(repo, mainBranchHead, revNumber);
                 calculatePatchChanges(repo, mainBranchHead, revNumber);

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/PatchComponentFactory.java

@@ -126,7 +126,8 @@ public JComponent getThreadActionsComponent(ThreadModel myThreadsModel) {
     }
 
     private JComponent createComponent(RadDiscussion disc) {
-        var editorPane = new MarkDownEditorPaneFactory(disc.body, patch.project, patch.radProject.id, patch.repo.getRoot());
+        final var verticalPanel = getVerticalPanel(5);
+        var editorPane = new MarkDownEditorPaneFactory(disc.body, patch.project, patch.radProject.id, patch.repo.getRoot(), verticalPanel);
         var revisionId = patch.findRevisionId(disc.id);
         var isOutDated = !patch.isDiscussionBelongedToLatestRevision(disc);
         var panelHandle = new EditablePanelHandler.PanelBuilder(patch.project, editorPane.htmlEditorPane(),
@@ -171,7 +172,6 @@ private JComponent createComponent(RadDiscussion disc) {
             titleText.append(" (OUTDATED)");
         }
         builder.withHeader(new JLabel(MarkDownEditorPaneFactory.wrapHtml(titleText.toString())), actionsPanel);
-        var verticalPanel = getVerticalPanel(5);
         verticalPanel.add(builder.build());
         var emojiJPanel = emojiPanel.getEmojiPanel();
         emojiJPanel.setBorder(BorderFactory.createEmptyBorder(PADDING_TOP_BOTTOM, PADDING_LEFT, PADDING_TOP_BOTTOM, 0));

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/review/PatchReviewThreadComponentFactory.java

@@ -76,8 +76,7 @@ public JComponent createDescSection() {
         if (Strings.isNullOrEmpty(description)) {
             description = RadicleBundle.message("noDescription");
         }
-        var editorPane = new MarkDownEditorPaneFactory(description, patch.project, patch.radProject.id, file);
-        descSection = Utils.descriptionPanel(editorPane, patch.project, "patch.proposal.change.description", f -> {
+        descSection = Utils.descriptionPanel(description, patch.project, patch.radProject.id, file, "patch.proposal.change.description", f -> {
             var newDesc = f.getText();
             if (Strings.isNullOrEmpty(newDesc)) {
                 return false;
@@ -153,8 +152,8 @@ private JComponent createReviewComponent(RadPatch.Review review) {
         var message = Strings.nullToEmpty(review.summary());
         var panel = new BorderLayoutPanel();
         panel.setOpaque(false);
-        var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file);
         var myPanel = Utils.getVerticalPanel(1);
+        var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file, myPanel);
         myPanel.setOpaque(false);
         myPanel.add(editorPane.htmlEditorPane());
         var verdictMsg = review.verdict() == RadPatch.Review.Verdict.ACCEPT ? RadicleBundle.message("approved") : RadicleBundle.message("requestChanges");
@@ -182,7 +181,7 @@ private JComponent createCommentComponent(RadDiscussion com) {
         }
         var panel = new BorderLayoutPanel();
         panel.setOpaque(false);
-        var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file);
+        var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file, panel);
         panel.addToCenter(StatusMessageComponentFactory.INSTANCE.create(editorPane.htmlEditorPane(), StatusMessageType.WARNING));
         emojiPanel = new PatchEmojiPanel(patchModel, com.reactions, com.id, radDetails);
         var verticalPanel = Utils.getVerticalPanel(5);