heroku-bouncer 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b619fbf7d6217756617859a7fa5f965c8ed1a01
-  data.tar.gz: 90beec382fbef5aaea8f8f2b907cdf6e4d18bf8e
+  metadata.gz: 273b79408c5b9a14c9c90997c17b3b6a67edeedc
+  data.tar.gz: 18c20c30803bee8462c96b65db39828d1b30ec38
 SHA512:
-  metadata.gz: 766781d8a9a9cca09a58f9c64c247cda6890a3b0c85239744f9630c3a7183162c5657e8ddd9a60b66f0fdc5975213c3a601d65d1a4ff03b8e058b690b7c2dcc6
-  data.tar.gz: 79d6db6a927996bee71f1c17f8b3cb6c3c490c4a160351b4e6c95e82646964e4c509da4b8959993e415af60074c05a222eb465776dfafe25db49778610e9a53c
+  metadata.gz: cbd28dc5744698aeee1f7774099bfa0c3ced1fb61f6f3cf436512918cafc63c6728be4f79bf04e6d519129044e1647be68dd1ed497ded8c909ad93ad51a06d7a
+  data.tar.gz: 66d0740ba41638219edb4c7988fdb6b7d897c3b2d84c1eeb264792e922b50523ab560711d27e1430bd1f30480628c80de4edf80bc681f26dde4714e4fee06156

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.1
+
+* #48: Address potential errors when making API call
+
 # 0.7.0
 
 * #46: expose refresh token when exposing access token

data/lib/heroku/bouncer/json_parser.rb

@@ -1,18 +1,55 @@
 # json parsers, all the way down
+Heroku::Bouncer::JsonParserError = Class.new(RuntimeError)
+
 Heroku::Bouncer::JsonParser = begin
+
   require 'oj'
-  lambda { |json| Oj.load(json, :mode => :strict) }
+
+  lambda do |json|
+    begin
+      Oj.load(json, :mode => :strict)
+    rescue Oj::ParseError
+      raise ::Heroku::Bouncer::JsonParserError
+    end
+  end
+
 rescue LoadError
+
   begin
+
     require 'yajl'
-    lambda { |json| Yajl::Parser.parse(json) }
+    lambda do |json|
+      begin
+        Yajl::Parser.parse(json)
+      rescue Yajl::ParseError
+        raise ::Heroku::Bouncer::JsonParserError
+      end
+    end
+
   rescue LoadError
+
     begin
+
       require 'multi_json'
-      lambda { |json| MultiJson.decode(json) }
+      lambda do |json|
+        begin
+          MultiJson.decode(json)
+        rescue MultiJson::ParseError
+          raise ::Heroku::Bouncer::JsonParserError
+        end
+      end
+
     rescue LoadError
+
       require 'json'
-      lambda { |json| JSON.parse(json) }
+      lambda do |json|
+        begin
+          JSON.parse(json)
+        rescue JSON::ParserError
+          raise ::Heroku::Bouncer::JsonParserError
+        end
+      end
+
     end
   end
 end

data/lib/heroku/bouncer/middleware.rb

@@ -8,6 +8,7 @@ require 'heroku/bouncer/decrypted_hash'
 class Heroku::Bouncer::Middleware < Sinatra::Base
 
   DecryptedHash = ::Heroku::Bouncer::DecryptedHash
+  UnableToFetchUserError = Class.new(RuntimeError)
 
   enable :raise_errors
   disable :show_exceptions
@@ -82,30 +83,34 @@ class Heroku::Bouncer::Middleware < Sinatra::Base
 
   # callback when successful, time to save data
   get '/auth/heroku/callback' do
-    token         = request.env['omniauth.auth']['credentials']['token']
-    refresh_token = request.env['omniauth.auth']['credentials']['refresh_token']
-    if @expose_email || @expose_user || !@allow_if_user.nil?
-      user = fetch_user(token)
-      # Wrapping lambda to prevent short-circut proc return
-      if @allow_if_user.respond_to?(:call)
-        if !lambda{ @allow_if_user.call(user)}.call
-          redirect to(@redirect_url) and return
+    begin
+      token         = request.env['omniauth.auth']['credentials']['token']
+      refresh_token = request.env['omniauth.auth']['credentials']['refresh_token']
+      if @expose_email || @expose_user || !@allow_if_user.nil?
+        user = fetch_user(token)
+        # Wrapping lambda to prevent short-circut proc return
+        if @allow_if_user.respond_to?(:call)
+          if !lambda{ @allow_if_user.call(user)}.call
+            redirect to(@redirect_url) and return
+          end
         end
+        @expose_user ? store_write(:user, user) : store_write(:user, true)
+        store_write(:email, user['email']) if @expose_email
+      else
+        store_write(:user, true)
       end
-      @expose_user ? store_write(:user, user) : store_write(:user, true)
-      store_write(:email, user['email']) if @expose_email
-    else
-      store_write(:user, true)
-    end
-    store_write(@session_sync_nonce.to_sym, session_nonce_cookie) if @session_sync_nonce
-    if @expose_token
-      store_write(:token, token)
-      store_write(:refresh_token, refresh_token)
-    end
-    store_write(:expires_at, Time.now.to_i + 3600 * 8)
+      store_write(@session_sync_nonce.to_sym, session_nonce_cookie) if @session_sync_nonce
+      if @expose_token
+        store_write(:token, token)
+        store_write(:refresh_token, refresh_token)
+      end
+      store_write(:expires_at, Time.now.to_i + 3600 * 8)
 
-    return_to = store_delete(:return_to) || '/'
-    redirect to(enforce_host(request.scheme, request.host, request.port, return_to))
+      return_to = store_delete(:return_to) || '/'
+      redirect to(enforce_host(request.scheme, request.host, request.port, return_to))
+    rescue UnableToFetchUserError
+      redirect to('/auth/failure')
+    end
   end
 
   # something went wrong
@@ -188,12 +193,22 @@ private
     extract_option(options, option, default)
   end
 
-  def fetch_user(token)
-    ::Heroku::Bouncer::JsonParser.call(
-      Faraday.new(ENV["HEROKU_API_URL"] || "https://api.heroku.com/").get('/account') do |r|
-        r.headers['Accept'] = 'application/vnd.heroku+json; version=3'
-        r.headers['Authorization'] = "Bearer #{token}"
-      end.body)
+  def fetch_user(token, retries = 3)
+    response = ::Faraday.new(ENV["HEROKU_API_URL"] || "https://api.heroku.com/").get('/account') do |r|
+      r.headers['Accept'] = 'application/vnd.heroku+json; version=3'
+      r.headers['Authorization'] = "Bearer #{token}"
+    end
+
+    if response.status == 200
+      ::Heroku::Bouncer::JsonParser.call(response.body)
+    elsif retries > 0
+      sleep(0.1)
+      fetch_user(token, retries - 1)
+    else
+      raise UnableToFetchUserError
+    end
+  rescue ::Faraday::ClientError, ::Heroku::Bouncer::JsonParserError
+    raise UnableToFetchUserError
   end
 
   def decrypt_store(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jonathan Dance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-heroku
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rapidly add Heroku OAuth to your Ruby app.