travis 1.6.18.travis.611.5 → 1.6.18.travis.612.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQzMDc4OGMyM2Y2Y2Y3MTE4ZTJhMDQxZDA0NmZiOTFlOGJlNjkzNg==
+    ZjMzYTAyOTk0M2Y5M2MxNjg1Mzc1MTJjNTgwNzNjMDc5ODk1NDYyMQ==
   data.tar.gz: !binary |-
-    ZTdlODBjZDQ5NjQ5OTAxZTAwZDgxMzhlY2Q1MTE3YzAzNmZkZTQ4Yg==
+    Njk0YjYwMzBkNzRmNGMwOTEwZDEyOTk0NTA4NzE4NWE2NWJiNWE2MQ==
 SHA512:
   metadata.gz: !binary |-
-    MjA0NjFkODQ1MzhiYjY0YTBhZTM1MDFkMGQ1MDI2Mzg2NjliOGMzNDRlZDcx
-    ZDgxZmY3ZjU2ZjhhN2MwY2VhZjQ3ZGI1MGJjODFhOGYzMjUyYmUzYzRiNmQ5
-    MzdlMWE1NTE5NGEwOWRmZTExMzhlODI1NWI0M2RjMmE3ZTczMmI=
+    MWE1Y2EzMmQ1OGIzYmQzNmNlYTA5YTRhOTVhYzI0MGM2MGQ0Y2U2YzA2Zjk5
+    ZDAwZjM4NjYxODM3ZTc1NzAxMmRjNWQ3N2M4NzQ4ODY3NDJiNjZhOTI4YjYy
+    N2FmZDYyY2QyNjAzZTJmYTY2Y2U5OGRjOTk5MTQ5M2EyNWUwOTY=
   data.tar.gz: !binary |-
-    ZDcxMjhmOGM4N2NhYzU1Y2YxYjUwYWNhN2ExODAyNWFkYWU3MzgyZjlkMWUw
-    NmNlMzg4NTZkYjFhN2IzYTA3ZTk2YjFkZDA2ZWQxYzMwMjgxZjcyNjA1NzFk
-    ODljMjgwMGI1NzEwOWI5YzY2ZGI1YWQyYzYwOGNkZTRlMGE1MDA=
+    ZjAyY2RhZGFhMzg2ZTBiZjcxMzE3ZWYzMmRhYmE1MWRiYWMwOWYwNmUzYzcz
+    N2ExZTNlMjhlNjZmYTU4M2M0OGNmZGY0ZjM5YmIzOGFkNGNkYjcwZmYyZTc4
+    MjBkMjY4MzMzNzg3NTVmNzE5YjM4MmQyNjA2YTRlZDYzMTAwOTg=

data/README.md

@@ -1328,6 +1328,7 @@ Config:        rvm: 1.9.3
         -s, --stdin                      upload key read from stdin
         -c, --check                      set exit code depending on key existing
         -g, --generate                   generate SSH key and set up for given GitHub user
+        -p, --passphrase PASSPHRASE      pass phrase to decrypt with when using --upload
 
 *This feature is for [Pro and Enterprise](#pro-and-enterprise) only.*
 
@@ -2063,6 +2064,8 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 * Add `--fingerprint` to `pubkey` command.
 * Add `fingerprint` to `Repository#public_key`.
 * Display better error messages for user errors (user data validation failing, etc).
+* Have `travis sshkey --upload` check that the content is a private key.
+* Make `travis sshkey --upload` prompt for and remove the pass phrase if the key is encrypted.
 
 **1.6.17** (July 25, 2014)
 

data/lib/travis/cli/sshkey.rb

@@ -12,6 +12,7 @@ module Travis
       on '-s', '--stdin',                   'upload key read from stdin'
       on '-c', '--check',                   'set exit code depending on key existing'
       on '-g', '--generate',                'generate SSH key and set up for given GitHub user'
+      on '-p', '--passphrase PASSPHRASE',   'pass phrase to decrypt with when using --upload'
 
       def_delegators :repository, :ssh_key
 
@@ -33,14 +34,17 @@ module Travis
       end
 
       def update_key(value, file)
-        self.description ||= ask("Key description: ") { |q| q.default = file } if interactive?
-        say "updating ssh key for #{color slug, :info} with key from #{color file, :info}"
+        error "#{file} does not look like a private key" unless value.lines.first =~ /PRIVATE KEY/
+        value = remove_passphrase(value)
+        self.description ||= ask("Key description: ") { |q| q.default = "Custom Key" } if interactive?
+        say "Updating ssh key for #{color slug, :info} with key from #{color file, :info}"
+        empty_line
         ssh_key.update(:value => value, :description => description || file)
       end
 
       def delete_key
         return if interactive? and not danger_zone? "Remove SSH key for #{color slug, :info}?"
-        say "removing ssh key for #{color slug, :info}"
+        say "Removing ssh key for #{color slug, :info}"
         ssh_key.delete
       rescue Travis::Client::NotFound
         warn "no key found to remove"
@@ -70,6 +74,16 @@ module Travis
         end
       end
 
+      def remove_passphrase(value)
+        return unless Tools::SSLKey.has_passphrase? value
+        return Tools::SSLKey.remove_passphrase(value, passphrase) || error("wrong pass phrase") if passphrase
+        error "Key is encrypted, but missing --passphrase option" unless interactive?
+        say "The private key is protected by a pass phrase."
+        result = Tools::SSLKey.remove_passphrase(value, ask("Enter pass phrase: ") { |q| q.echo = "*" }) until result
+        empty_line
+        result
+      end
+
       def check_access(gh)
         gh["repos/#{slug}"]
       rescue GH::Error

data/lib/travis/tools/ssl_key.rb

@@ -17,6 +17,19 @@ module Travis
         @to_rsa = OpenSSL::PKey::RSA.new(public_key)
       end
 
+      def has_passphrase?(key)
+        OpenSSL::PKey::RSA.new(key, key)
+        false
+      rescue OpenSSL::PKey::RSAError
+        true
+      end
+
+      def remove_passphrase(key, passphrase)
+        OpenSSL::PKey::RSA.new(key, passphrase).to_s
+      rescue OpenSSL::PKey::RSAError
+        false
+      end
+
       def rsa_ssh(key)
         ['ssh-rsa ', "\0\0\0\assh-rsa#{sized_bytes(key.e)}#{sized_bytes(key.n)}"].pack('a*m').gsub("\n", '')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.18.travis.611.5
+  version: 1.6.18.travis.612.5
 platform: ruby
 authors:
 - Konstantin Haase