travis 1.6.17.travis.588.5 → 1.6.17.travis.589.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIzMzljYjljZDVjMTlkZWFmZWE0Y2FmODgzMGYxNTdjYTY0MDQ1MQ==
+    NWI2MjQ5MDBmNmZlZTQ1OTlkODQxMjNmYTZlZmUxZTIxZTc2MDgzNw==
   data.tar.gz: !binary |-
-    MWU3NmE0OWE5NDIzMmM5NzI4N2Y4MWJhMmFiNzZlODkzODU0ZDIxZg==
+    ZmJkYTgzNzQ0MTA5YmJmODg1MTU3YjNkMzljZGZmZDk4YTAyODZlMQ==
 SHA512:
   metadata.gz: !binary |-
-    MWUyMjBiOWM5ZjEzZjZmZTJkNWVlYjg0MzM0OTNhYzY0NmRhYjY3NjBhNWJm
-    NmVjZTk0ZTc1NzkwMDQyNTE4ZWE3ZWE1NmE3ZWJhYjllNTdhMjEzNTIwMmVh
-    ZDczOTRiZTUxMTVmNjQyOTA2NGMwNjI2NWNjYTZiZGFkY2ZlNDI=
+    NWQwODIyNGJkMWFhMDM5ZjdkYTFmYjc4MDc0OWE3OWQxYTc3NzM4YjA4MDZk
+    YTEzNzZmNjA0NDkwZDlkNjFiNGI5Yjc0YzVkMTMzNmI3ZDU4ZTc1MWM0NTcx
+    ODk5MWNiZDM2N2QzYzIyMmVkZTMyYWUzZjJmZjc1MGRlNDNjN2M=
   data.tar.gz: !binary |-
-    OTg1ZTU2YmYwNzI0MTg1YzIzODY1NjM2ZDMyYzNkYWE0YWUzMTUxMDVjMDkw
-    MzBiMWIxZjBhOTRlYjE0MDBjNzg5NjEyNDZiYjc0MjBmMjUzZmU1NTgyNWZj
-    OWFkZGI2MmY3ZGUwNmU5ZDhkMzMyNmE0NGY0Nzc2OTNlYmY5NTg=
+    YTM5ZDA4OGM0NGQyZDZkMWJjZDZmYjQ0YmM0NzZiNzdkZDM4N2I2YzcxMmFk
+    YjRkMzU5ZDljNDU2ODQ5ZmNmZmIwYjZkZjlkNjUzNzU2ZWI3MjYxNjdlY2Y0
+    YzI4N2YxMGI5M2I2NTJiNDAyMzIwODg2N2JjNzg2ODkyYzFjYTk=

data/README.md

@@ -1090,6 +1090,7 @@ Or a job:
         -u, --upload FILE                upload key from given file
         -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
 
 *This feature is for [Pro and Enterprise](#pro-and-enterprise) only.*
 
@@ -1112,6 +1113,20 @@ And to remove it again:
     removing ssh key for travis-pro/test-project
     No custom SSH key installed.
 
+You can also have it generate a key for a given GitHub user (for instance, for a dedicated CI user that only has read access). The public key will automatically be added to GitHub and the private key to Travis CI:
+
+    $ travis sshkey --generate
+    We need the GitHub login for the account you want to add the key to.
+    This information will not be sent to Travis CI, only to api.github.com.
+    The password will not be displayed.
+    
+    Username: travisbot
+    Password for travisbot: **************
+    
+    Generating RSA key.
+    Uploading public key to GitHub.
+    Uploading private key to Travis CI.
+
 #### `status`
 
     Usage: travis status [options]

data/lib/travis/client/repository.rb

@@ -1,6 +1,5 @@
 require 'travis/client'
-require 'openssl'
-require 'base64'
+require 'travis/tools/ssl_key'
 
 module Travis
   module Client
@@ -17,32 +16,17 @@ module Travis
           Base64.encode64(encrypted).gsub(/\s+/, "")
         end
 
-        def to_ssh
-          ['ssh-rsa ', "\0\0\0\assh-rsa#{sized_bytes(to_rsa.e)}#{sized_bytes(to_rsa.n)}"].pack('a*m').gsub("\n", '')
+        def to_rsa
+          Tools::SSLKey.public_rsa_key(to_s)
         end
 
-        def to_rsa
-          @to_rsa ||= OpenSSL::PKey::RSA.new(to_s)
-        rescue OpenSSL::PKey::RSAError
-          public_key = to_s.gsub('RSA PUBLIC KEY', 'PUBLIC KEY')
-          @to_rsa = OpenSSL::PKey::RSA.new(public_key)
+        def to_ssh
+          Tools::SSLKey.rsa_ssh(to_rsa)
         end
 
         def ==(other)
           other.to_s == self
         end
-
-        private
-
-          def sized_bytes(value)
-            bytes = to_byte_array(value.to_i)
-            [bytes.size, *bytes].pack('NC*')
-          end
-
-          def to_byte_array(num, *significant)
-            return significant if num.between?(-1, 0) and significant[0][7] == num[7]
-            to_byte_array(*num.divmod(256)) + significant
-          end
       end
 
       include States

data/lib/travis/tools/github.rb

@@ -36,6 +36,14 @@ module Travis
         each_token { |t| break yield(t) }
       end
 
+      def with_basic_auth(&block)
+        user, password = ask_credentials
+        basic_auth(user, password, true) do |gh|
+          gh['user'] # so otp kicks in
+          yield gh
+        end
+      end
+
       def each_token
         require 'gh' unless defined? GH
         possible_tokens { |t| yield(t) if acceptable?(t) }
@@ -68,15 +76,20 @@ module Travis
         end
 
         if manual_login
-          login_header.call if login_header
-          user     = github_login || ask_login.call
-          password = ask_password.arity == 0 ? ask_password.call : ask_password.call(user)
+          user, password = ask_credentials
           yield login(user, password, true)
         end
 
         after_tokens.call
       end
 
+      def ask_credentials
+        login_header.call if login_header
+        user     = github_login || ask_login.call
+        password = ask_password.arity == 0 ? ask_password.call : ask_password.call(user)
+        [user, password]
+      end
+
       def possible_logins(&block)
         netrc_logins(&block)
         hub_logins(&block)
@@ -191,22 +204,27 @@ module Travis
         api_url[%r{^(?:https?://)?([^/]+)}, 1]
       end
 
-      def login(user, password, die = true, otp = nil)
+      def basic_auth(user, password, die = true, otp = nil, &block)
         opt           = { :username => user, :password => password }
         opt[:headers] = { "X-GitHub-OTP" => otp } if otp
-        gh            = GH.with(opt)
-        reply         = gh.post('/authorizations', :scopes => scopes, :note => note)
-        self.callback = proc { gh.delete reply['_links']['self']['href'] } if drop_token
-        reply['token']
+        yield GH.with(opt)
       rescue GH::Error => error
         if error.info[:response_status] == 401 and error.info[:response_headers]['x-github-otp'].to_s =~ /required/
           otp = ask_otp.arity == 0 ? ask_otp.call : ask_otp.call(user)
-          login(user, password, die, otp)
+          basic_auth(user, password, die, otp, &block)
         elsif die
           raise gh_error(error)
         end
       end
 
+      def login(user, password, die = true, otp = nil)
+        basic_auth(user, password, die, otp) do |gh|
+          reply         = gh.post('/authorizations', :scopes => scopes, :note => note)
+          self.callback = proc { gh.delete reply['_links']['self']['href'] } if drop_token
+          reply['token']
+        end
+      end
+
       def acceptable?(token)
         return true unless check_token
         gh   = GH.with(:token => token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.17.travis.588.5
+  version: 1.6.17.travis.589.5
 platform: ruby
 authors:
 - Konstantin Haase
@@ -39,7 +39,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday