fbauth 0.9.9.3 → 0.9.9.4

data/app/controllers/facebook_auth_functions.rb

@@ -36,6 +36,9 @@ private
     # If no valid session auth or params auth, last chance try the JS SDK
     data = parse_cookie
     auth = validate_and_save(data) unless data.nil?
+
+    logger.warn("Unable to parse any security params for request - cold authentication required")
+
     return auth
   end
 
@@ -53,6 +56,7 @@ private
     unless session[:fbauth].nil?
       begin
         parms = JSON.parse(session[:fbauth])
+        logger.warn("Parsed facebook params from existing rails session")
       rescue => e
         session[:fbauth] = nil
       end
@@ -65,22 +69,12 @@ private
       parms = JSON.parse(params[:session])
       logger.warn("Parsed facebook params from session parameter (deprecated)")
     elsif params[:signed_request].present?
-      sig, b64udata = params[:signed_request].split('.')
-      json = b64udata.tr('-_', '+/').unpack('m')[0]
       begin
-        parms = JSON.parse(json)
+        parms = FacebookDecoder.decode(params[:signed_request])
+        logger.warn("Parsed facebook params from signed_request parameter")
       rescue => e
-        begin
-          parms = JSON.parse(json + '"}')
-        rescue => e2
-          begin
-            parms = JSON.parse(json + '}')
-          rescue => e3
-            parms = {}
-          end
-        end
+        logger.warn("Error with signed_request data: #{e}")
       end
-      logger.warn("Parsed facebook params from signed_request parameter")
     end
     parms
   end
@@ -93,6 +87,7 @@ private
         key, value = pair.split("=")
         parms[key] = value
       end
+      logger.warn("Parsed facebook params from cookie")
     end
     parms
   end

data/lib/facebook_decoder.rb

@@ -0,0 +1,29 @@
+require 'active_support'
+
+class FacebookDecoder
+
+  def self.decode data
+    unless data.nil?
+      sig, b64udata = data.split('.')
+      unless b64udata.nil?
+        json = b64udata.tr('-_', '+/').unpack('m')[0]
+        begin
+          parms = JSON.parse(json)
+        rescue => e
+          begin
+            parms = JSON.parse(json + '"}')
+          rescue => e2
+            begin
+              parms = JSON.parse(json + '}')
+            rescue => e3
+              raise "Unable to parse json structure - '#{json}'"
+              parms = {}
+            end
+          end
+        end
+      end
+    end
+    parms
+  end
+
+end

data/lib/fbauth.rb

@@ -9,6 +9,7 @@
   end
 end
 
+require 'facebook_decoder.rb'
 require 'facebook_auth.rb'
 require 'facebook_config.rb'
 require 'facebook_graph.rb'

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  - 3
-  version: 0.9.9.3
+  - 4
+  version: 0.9.9.4
 platform: ruby
 authors: 
 - Three Wise Men Inc.
@@ -30,6 +30,7 @@ extra_rdoc_files:
 files: 
 - lib/facebook_auth.rb
 - lib/facebook_config.rb
+- lib/facebook_decoder.rb
 - lib/facebook_graph.rb
 - lib/fbauth.rb
 - app/controllers/facebook_auth_functions.rb