Merge pull request #6861 from microsoft/bugfix-windows-sftp

Bugfix windows sftp

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/IntelliJAzureIcons.java

@@ -60,7 +60,7 @@ public class IntelliJAzureIcons {
             put(AzureIcons.Common.SHOW_PROPERTIES, AllIcons.Actions.Properties);
             put(AzureIcons.Common.UNKNOWN_ICON, AllIcons.Nodes.Unknown);
             put(AzureIcons.Action.CONSOLE, AllIcons.Nodes.Console);
-            put(AzureIcons.Action.SFTP, AllIcons.Actions.ListFiles);
+            put(AzureIcons.Action.SFTP, AllIcons.Nodes.Servlet);
         }
     };
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/task/IntellijAzureTaskManager.java

@@ -87,20 +87,20 @@ protected void doRunInBackgroundableModal(final Runnable runnable, final AzureTa
         // refer https://jetbrains.org/intellij/sdk/docs/basics/disposers.html
         // refer https://github.com/JetBrains/intellij-community/commit/d7ac4e133fec7e4c1e63f4c1d7dda65e25258b81 ide.background.tasks has been removed
         final String title = StringUtils.capitalize(Objects.requireNonNull(task.getDescription()).toString());
-        final Task.Backgroundable modalTask = new Task.Backgroundable((Project) task.getProject(), title, task.isCancellable(), foreground) {
+        final Task.Backgroundable modalTask = new Task.ConditionalModal((Project) task.getProject(), title, task.isCancellable(), foreground) {
             @Override
             public void run(@Nonnull final ProgressIndicator progressIndicator) {
                 task.setMonitor(new IntellijTaskMonitor(progressIndicator));
                 task.setBackgrounded(false);
                 runnable.run();
             }
-
-            @Override
-            public void processSentToBackground() {
-                task.setBackgrounded(true);
-            }
         };
-        ProgressManager.getInstance().run(modalTask);
+        if (ApplicationManager.getApplication().isDispatchThread()) {
+            ApplicationManager.getApplication().executeOnPooledThread(
+                    () -> ProgressManager.getInstance().run(modalTask));
+        } else {
+            ProgressManager.getInstance().run(modalTask);
+        }
     }
 
     private ModalityState toIntellijModality(final AzureTask<?> task) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/ssh/BrowseRemoteHostSftpAction.java

@@ -10,16 +10,21 @@
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.remote.AuthType;
+import com.intellij.ssh.RemoteCredentialsUtil;
+import com.intellij.ssh.SshException;
 import com.intellij.ssh.config.unified.SshConfig;
+import com.intellij.ssh.ui.unified.SshUiData;
 import com.intellij.ui.content.Content;
 import com.jetbrains.plugins.webDeployment.config.AccessType;
 import com.jetbrains.plugins.webDeployment.config.GroupedServersConfigManager;
 import com.jetbrains.plugins.webDeployment.config.WebServerConfig;
 import com.jetbrains.plugins.webDeployment.config.WebServerGroupingWrap;
 import com.jetbrains.plugins.webDeployment.ui.WebServerToolWindowFactory;
 import com.jetbrains.plugins.webDeployment.ui.WebServerToolWindowPanel;
+import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
+import com.microsoft.azure.toolkit.lib.common.operation.OperationBundle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.compute.virtualmachine.VirtualMachine;
 import org.apache.commons.lang3.reflect.MethodUtils;
@@ -30,18 +35,36 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 
 public class BrowseRemoteHostSftpAction {
 
-    @AzureOperation(name = "vm.browse_files_sftp", params = "vm.getName()", type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "vm.browse_files_sftp.vm", params = "vm.getName()", type = AzureOperation.Type.ACTION)
     public static void browseRemoteHost(VirtualMachine vm, @Nonnull Project project) {
         final SshConfig curSshConfig = AddSshConfigAction.getOrCreateSshConfig(vm, project);
-        final WebServerConfig server = getOrCreateWebServerConfigFromSsh(validateSshConfig(curSshConfig), project);
-        AzureTaskManager.getInstance().runLater(() -> {
+        final SshConfig sshConfig = validateSshConfig(curSshConfig);
+        final Runnable openToolWindowHandler = () -> {
+            final WebServerConfig server = getOrCreateWebServerConfigFromSsh(sshConfig, project);
             final ToolWindow toolWindow = WebServerToolWindowFactory.getWebServerToolWindow(project);
             toolWindow.show(null);
             toolWindow.activate(() -> selectServerInToolWindow(toolWindow, server.getName(), project));
+        };
+        tryConnecting(project, sshConfig, openToolWindowHandler);
+    }
+
+    private static void tryConnecting(@Nonnull Project project, SshConfig sshConfig, Runnable callback) {
+        final SshUiData sshUiData = new SshUiData(sshConfig);
+        final AzureString title = OperationBundle.description("vm.connecting.vm", sshConfig.getName());
+        AzureTaskManager.getInstance().runInModal(title, () -> {
+            try {
+                RemoteCredentialsUtil.connectionBuilder(sshUiData, project)
+                    .withConnectionTimeout(10L, TimeUnit.SECONDS)
+                    .checkCanAuthenticate(true);
+                AzureTaskManager.getInstance().runLater(callback);
+            } catch (final SshException e) {
+                AzureMessager.getMessager().error(e, title.toString());
+            }
         });
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/ssh/ConnectUsingSshActionCommunityImpl.java

@@ -25,7 +25,7 @@ public static ConnectUsingSshAction getInstance() {
         return instance;
     }
 
-    @AzureOperation(name = "vm.connect_using_ssh_community", params = "vm.getName()", type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "vm.connect_using_ssh_community.vm", params = "vm.getName()", type = AzureOperation.Type.ACTION)
     public void connectBySsh(VirtualMachine vm, @Nonnull Project project) {
         final String machineName = vm.getName();
         final String terminalTitle =  String.format(SSH_TERMINAL_TABLE_NAME, machineName);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/ssh/ConnectUsingSshActionUltimateImpl.java

@@ -42,7 +42,7 @@ public static ConnectUsingSshAction getInstance() {
         return instance;
     }
 
-    @AzureOperation(name = "vm.connect_using_ssh_community_ultimate", params = "vm.getName()", type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "vm.connect_using_ssh_ultimate.vm", params = "vm.getName()", type = AzureOperation.Type.ACTION)
     public void connectBySsh(VirtualMachine vm, @Nonnull Project project) {
         final SshConfig existingConfig = AddSshConfigAction.getOrCreateSshConfig(vm, project);
         AzureTaskManager.getInstance().runInBackground(SSH_CONNECTION_TITLE,() ->

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/operation.properties

@@ -432,8 +432,11 @@ vm.list_offers.publisher=load offers in publisher({0})
 vm.list_publishers=load publishers
 vm.list_skus.offer=load skus in offer({0})
 vm.add_ssh_config.vm=Add SSH config for ({0})
-vm.connect_by_ssh.vm=Connect using SSH for ({0})
+vm.connect_using_ssh.vm=Connect ({0}) using SSH
+vm.connect_using_ssh_ultimate.vm=Connect ({0}) using SSH in Ultimate version
+vm.connect_using_ssh_community.vm=Connect ({0}) using SSH in Community version
 vm.browse_files_sftp.vm=Browse files of ({0}) using sftp
+vm.connecting.vm=Connecting to ({0}) ...
 vm.open_ssh_config_dialog=Open "SSH Configurations" Dialog
 vm.create_vm.group=create virtual machine in resource group ({0})
 webapp.create_app.app|subscription|image=create web app({0}) in subscription({1}) with private registry image({2})

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-vm-lib/src/main/java/com/microsoft/azure/toolkit/ide/vm/VirtualMachineActionsContributor.java

@@ -39,7 +39,7 @@ public void registerActions(AzureActionManager am) {
         am.registerAction(ADD_SSH_CONFIG, new Action<>(ADD_SSH_CONFIG, addSshConfigView));
 
         final ActionView.Builder connectSshView = new ActionView.Builder("Connect Using SSH", AzureIcons.Action.CONSOLE.getIconPath())
-                .title(s -> Optional.ofNullable(s).map(r -> description("vm.connect_by_ssh.vm", ((VirtualMachine) r).getName())).orElse(null))
+                .title(s -> Optional.ofNullable(s).map(r -> description("vm.connect_using_ssh.vm", ((VirtualMachine) r).getName())).orElse(null))
                 .enabled(s -> s instanceof VirtualMachine && ((VirtualMachine) s).getFormalStatus().isRunning());
         am.registerAction(CONNECT_SSH, new Action<>(CONNECT_SSH, connectSshView));