google-api-client 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.2
+
+* Fixed incompatibility with Ruby 1.8.7
+
 # 0.4.1
 
 * Fixed ancestor checking issue when assigning Autoparse identifiers

data/lib/google/api_client.rb

@@ -401,6 +401,76 @@ module Google
       end
     end
 
+    ##
+    # Verifies an ID token against a server certificate. Used to ensure that
+    # an ID token supplied by an untrusted client-side mechanism is valid.
+    # Raises an error if the token is invalid or missing.
+    def verify_id_token!
+      gem 'jwt', '~> 0.1.4'
+      require 'jwt'
+      require 'openssl'
+      @certificates ||= {}
+      if !self.authorization.respond_to?(:id_token)
+        raise ArgumentError, (
+          "Current authorization mechanism does not support ID tokens: " +
+          "#{self.authorization.class.to_s}"
+        )
+      elsif !self.authorization.id_token
+        raise ArgumentError, (
+          "Could not verify ID token, ID token missing. " +
+          "Scopes were: #{self.authorization.scope.inspect}"
+        )
+      else
+        check_cached_certs = lambda do
+          valid = false
+          for key, cert in @certificates
+            begin
+              self.authorization.decoded_id_token(cert.public_key)
+              valid = true
+            rescue JWT::DecodeError, Signet::UnsafeOperationError
+              # Expected exception. Ignore, ID token has not been validated.
+            end
+          end
+          valid
+        end
+        if check_cached_certs.call()
+          return true
+        end
+        request = self.generate_request(
+          :http_method => :get,
+          :uri => 'https://www.googleapis.com/oauth2/v1/certs',
+          :authenticated => false
+        )
+        response = self.transmit(:request => request)
+        if response.status >= 200 && response.status < 300
+          @certificates.merge!(
+            Hash[MultiJson.decode(response.body).map do |key, cert|
+              [key, OpenSSL::X509::Certificate.new(cert)]
+            end]
+          )
+        elsif response.status >= 400
+          case response.status
+          when 400...500
+            exception_type = ClientError
+          when 500...600
+            exception_type = ServerError
+          else
+            exception_type = TransmissionError
+          end
+          url = request.to_env(Faraday.default_connection)[:url]
+          raise exception_type,
+            "Could not retrieve certificates from: #{url}"
+        end
+        if check_cached_certs.call()
+          return true
+        else
+          raise InvalidIDTokenError,
+            "Could not verify ID token against any available certificate."
+        end
+      end
+      return nil
+    end
+
     ##
     # Generates a request.
     #

data/lib/google/api_client/discovery/method.rb

@@ -172,12 +172,14 @@ module Google
         query_parameters = parameters.reject do |k, v|
           template_variables.include?(k)
         end
-        if query_parameters.size > 0
-          uri.query_values = (uri.query_values || []) + query_parameters
+        # encode all non-template parameters
+        params = ""
+        unless query_parameters.empty?
+          params = "?" + Addressable::URI.form_encode(query_parameters)
         end
         # Normalization is necessary because of undesirable percent-escaping
         # during URI template expansion
-        return uri.normalize
+        return uri.normalize + params
       end
 
       ##

data/lib/google/api_client/discovery/schema.rb

@@ -74,22 +74,26 @@ module Google
             Google::INFLECTOR.camelize(api.name)
           api_version_string =
             Google::INFLECTOR.camelize(api.version).gsub('.', '_')
-          if Google::APIClient::Schema.const_defined?(api_name_string, false)
+          # This is for compatibility with Ruby 1.8.7.
+          # TODO(bobaman) Remove this when we eventually stop supporting 1.8.7.
+          args = []
+          args << false if Class.method(:const_defined?).arity != 1
+          if Google::APIClient::Schema.const_defined?(api_name_string, *args)
             api_name = Google::APIClient::Schema.const_get(
-              api_name_string, false
+              api_name_string, *args
             )
           else
             api_name = Google::APIClient::Schema.const_set(
               api_name_string, Module.new
             )
           end
-          if api_name.const_defined?(api_version_string, false)
-            api_version = api_name.const_get(api_version_string, false)
+          if api_name.const_defined?(api_version_string, *args)
+            api_version = api_name.const_get(api_version_string, *args)
           else
             api_version = api_name.const_set(api_version_string, Module.new)
           end
-          if api_version.const_defined?(schema_name, false)
-            schema_class = api_version.const_get(schema_name, false)
+          if api_version.const_defined?(schema_name, *args)
+            schema_class = api_version.const_get(schema_name, *args)
           end
         end
 

data/lib/google/api_client/errors.rb

@@ -36,5 +36,10 @@ module Google
     # A 5xx class HTTP error occurred.
     class ServerError < TransmissionError
     end
+
+    ##
+    # An exception that is raised if an ID token could not be validated.
+    class InvalidIDTokenError < StandardError
+    end
   end
 end

data/lib/google/api_client/version.rb

@@ -22,7 +22,7 @@ if !defined?(::Google::APIClient::VERSION)
       module VERSION
         MAJOR = 0
         MINOR = 4
-        TINY  = 1
+        TINY  = 2
 
         STRING = [MAJOR, MINOR, TINY].join('.')
       end

data/tasks/gem.rake

@@ -96,3 +96,5 @@ end
 
 desc 'Alias to gem:package'
 task 'gem' => 'gem:package'
+
+task 'gem:release' => 'gem:gemspec'

data/tasks/git.rake

@@ -3,9 +3,9 @@ namespace :git do
     desc 'List tags from the Git repository'
     task :list do
       tags = `git tag -l`
-      tags.gsub!('\r', '')
-      tags = tags.split('\n').sort {|a, b| b <=> a }
-      puts tags.join('\n')
+      tags.gsub!("\r", '')
+      tags = tags.split("\n").sort {|a, b| b <=> a }
+      puts tags.join("\n")
     end
 
     desc 'Create a new tag in the Git repository'
@@ -19,6 +19,11 @@ namespace :git do
       v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
       abort "Versions don't match #{v} vs #{PKG_VERSION}" if v != PKG_VERSION
 
+      git_status = `git status`
+      if git_status !~ /nothing to commit \(working directory clean\)/
+        abort "Working directory isn't clean."
+      end
+
       tag = "#{PKG_NAME}-#{PKG_VERSION}"
       msg = "Release #{PKG_NAME}-#{PKG_VERSION}"
 

metadata

@@ -2,7 +2,7 @@
 name: google-api-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bob Aman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: signet