direct_ssh 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df4c18561f99a4f575ae461e874957d96520c9ddaae0b74b31efdb1adcbb316
-  data.tar.gz: 6c3d0c66f70e48f87cf0b7463ddb7d83a214c496aa8a82fb95bd3ca78768cacb
+  metadata.gz: 0f830d2885afb47efdda1ab0fb71717a1a520e8a1862c4c9091062b938e0e386
+  data.tar.gz: a047bd0d2a74fcb96bf5a9383fb57b0b42a977ce5725d10ca7e856cc16beb106
 SHA512:
-  metadata.gz: fb0d6ec9537203786cd033a02d047c24d314236fd7ce0b7d99c7e1e78987168bafc85301331b35fcf7d71b4ce99ec6cb557c240666c42d597362a053eb304af2
-  data.tar.gz: c1ed0cf88bde4eb7a86e0f920bd83941d374a847483003ab66fd03ede2c0a82d62625c437560fb683a150e5a20ab0d058ac063d9aa5fbeca857ec705f47fbb76
+  metadata.gz: ec3fed44a476fa188d80941efdeb6b229852355764d00384d8c3eb178640448521a69a75e68ec2b243e1bde4f8f7b08c1a38104394bb01ac2f759123c5d6eae4
+  data.tar.gz: 0fa20e65151e8a2796aec8303d4e09d78e5f44e1bd113c0e6d63b089dfcbbfadd6a3a9a8b06b78cc808470870a56adb468070cdfd7f85af29aca68effce5face

data/lib/direct_ssh/key_handler.rb

@@ -6,7 +6,7 @@ require 'base64'
 
 module KeyHandler
     def self.send_key_to_remote(ssh)
-        ssh_public_key = get_ssh_public_key
+        ssh_public_key = get_ssh_public_key.chomp
         send_ssh_public_key_to_remote(ssh, ssh_public_key)
     end
 
@@ -32,11 +32,11 @@ module KeyHandler
     end
 
     def self.create_ssh_files
-        FileUtils.mkdir_p Dir.home + '/.ssh'
-        FileUtils.touch   Dir.home + '/.ssh/id_rsa'
-        FileUtils.touch   Dir.home + '/.ssh/id_rsa.pub'
-        FileUtils.touch   Dir.home + '/.ssh/authorized_keys'
-        FileUtils.touch   Dir.home + '/.ssh/known_hosts'
+        FileUtils.mkdir Dir.home + '/.ssh'
+        FileUtils.touch Dir.home + '/.ssh/id_rsa'
+        FileUtils.touch Dir.home + '/.ssh/id_rsa.pub'
+        FileUtils.touch Dir.home + '/.ssh/authorized_keys'
+        FileUtils.touch Dir.home + '/.ssh/known_hosts'
     end
 
     # see: http://www.noah.org/wiki/SSH_public_keys
@@ -61,34 +61,73 @@ module KeyHandler
     ################################################################
     # remote ssh key process
 
+    def self.is_windows?(ssh)
+        ssh.exec!("echo %os%").chomp != "%os%"
+    end
+
     def self.send_ssh_public_key_to_remote(ssh, key)
+        is_win = is_windows?(ssh)
+
         if !remote_file_exists?(ssh, '~/.ssh/authorized_keys')
-            remote_create_ssh_files(ssh)
-            remote_chmod_ssh_files(ssh)
+            remote_create_ssh_files(ssh, is_win)
+            remote_chmod_ssh_files(ssh, is_win)
         end
 
-        # append public_key to remote '~/.ssh/authorized_keys'
-        ssh.exec!("echo '#{key}' >> ~/.ssh/authorized_keys")
+        remote_append_key(ssh, key, is_win)
     end
 
     def self.remote_file_exists?(ssh, path)
-        ssh.exec!("[ ! -f #{path} ] && echo NOT_EXIST") == nil
+        # windows & linux       OK
+        # path including '~/'   OK
+        ssh.exec!("[ ! -f #{path} ] && echo NOT_EXIST").empty?
     end
 
-    def self.remote_create_ssh_files(ssh)
-        ssh.exec!('mkdir -p ~/.ssh')
-        ssh.exec!('touch    ~/.ssh/id_rsa')
-        ssh.exec!('touch    ~/.ssh/id_rsa.pub')
-        ssh.exec!('touch    ~/.ssh/authorized_keys')
-        ssh.exec!('touch    ~/.ssh/known_hosts')
+    def self.remote_create_ssh_files(ssh, is_win)
+        if is_win
+            ssh_exec!(ssh, 'mkdir .ssh')
+            ssh_exec!(ssh, 'touch .ssh\id_rsa')
+            ssh_exec!(ssh, 'touch .ssh\id_rsa.pub')
+            ssh_exec!(ssh, 'touch .ssh\authorized_keys')
+            ssh_exec!(ssh, 'touch .ssh\known_hosts')
+        else
+            ssh_exec!(ssh, 'mkdir ~/.ssh')
+            ssh_exec!(ssh, 'touch ~/.ssh/id_rsa')
+            ssh_exec!(ssh, 'touch ~/.ssh/id_rsa.pub')
+            ssh_exec!(ssh, 'touch ~/.ssh/authorized_keys')
+            ssh_exec!(ssh, 'touch ~/.ssh/known_hosts')
+        end
     end
 
     # see: http://www.noah.org/wiki/SSH_public_keys
-    def self.remote_chmod_ssh_files(ssh)
-        ssh.exec!('chmod 700 ~/.ssh')
-        ssh.exec!('chmod 600 ~/.ssh/id_rsa')
-        ssh.exec!('chmod 644 ~/.ssh/id_rsa.pub')
-        ssh.exec!('chmod 644 ~/.ssh/authorized_keys')
-        ssh.exec!('chmod 644 ~/.ssh/known_hosts')
+    def self.remote_chmod_ssh_files(ssh, is_win)
+        if is_win
+            # puts "NOTE 1: The default mode on windows should work"
+            # puts "NOTE 2: 'chmod' is not available or doesn't work on windows."
+            # puts "  If password asked, try to handle according to"
+            # puts "  https://social.technet.microsoft.com/Forums/Azure/en-US/e4c11aed-1d8b-4ff4-89ad-c90c62e13ce0/ssh-asking-for-password-even-i-have-private-key"
+            # puts "  and log file C:\\ProgramData\\ssh\\logs\\sshd.log"
+        else
+            ssh_exec!(ssh, 'chmod 700 ~/.ssh')
+            ssh_exec!(ssh, 'chmod 600 ~/.ssh/id_rsa')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/id_rsa.pub')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/authorized_keys')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/known_hosts')
+        end
+    end
+
+    # append public_key to remote '~/.ssh/authorized_keys'
+    def self.remote_append_key(ssh, key, is_win)
+        if is_win
+            ssh_exec!(ssh, "echo #{key} >> .ssh\\authorized_keys")
+        else
+            ssh_exec!(ssh, "echo #{key} >> ~/.ssh/authorized_keys")
+        end
+    end
+
+    def self.ssh_exec!(ssh, cmd)
+        # puts "# #{cmd}"
+        res = ssh.exec! cmd
+        # puts res.force_encoding('SJIS').encode('UTF-8')
+        res
     end
 end

data/lib/direct_ssh/version.rb

@@ -1,3 +1,3 @@
 module DirectSsh
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: direct_ssh
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Xia Xiongjun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh