userbin 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703e1f90038da45bdc11c03d1c2059587daf0cdd
-  data.tar.gz: 3d25c062d7f285e2c1bbb00e1ad441268b336aaa
+  metadata.gz: fe753d445c9d4a87e78d129234ccf88ab2e5ef1f
+  data.tar.gz: 611c69c56f409d7157ada99598e4d0a4063ff125
 SHA512:
-  metadata.gz: b3528a4705cd2c6f3f530d6e2351c5f703ba8f28be9303017a30d6fa0d745c69c335434ae3737a86bf14cfc891b849834aebbca3e469e6e83c789cd1b2c08147
-  data.tar.gz: 4d0e84b2dbbe75a9662f168c854669d7a496ae8eea9ea24461fc79eebad21ea885a7d1428a09d05a3f8b9a2ca9a680d8edbeeabbd6d58c7da484e207360e7d87
+  metadata.gz: bb5795d97506c84c17cfc09b96c73d022ab2e685b554aab90a01c0be9f5f5443907e1c53c117068c2a3682dc5e7350eb02586394b6017694ad47eeb5193814ab
+  data.tar.gz: 883d892aa1169d658c874b6f7dacc8400c5914ac1ac446187393eadad5fd30b992a915d5c252ffcce782fd932b3c6ab5af8871e2331324df9db14ea6ac3ddc66

data/README.md

@@ -142,6 +142,14 @@ By default, the Userbin middleware will automatically insert a `<script>` tag be
 config.skip_script_injection = true
 ```
 
+### lock_file
+
+By default, no locking is performed to ensure that multiple processes race for finding and creating users. Setting this option in multi-process (not multi-thread) setups like Unicorn is **highly recommended**.
+
+```ruby
+config.lock_file = File.join(Rails.root, 'tmp/userbin.lock')
+```
+
 
 Further configuration and customization
 ---------------------------------------

data/lib/userbin.rb

@@ -8,16 +8,17 @@ require "userbin/basic_auth"
 
 require "userbin/railtie" if defined?(Rails::Railtie)
 
-api_endpoint = ENV.fetch('USERBIN_API_ENDPOINT') {3
+api_endpoint = ENV.fetch('USERBIN_API_ENDPOINT') {
   "https://api.userbin.com"
 }
 
 @api = Her::API.setup url: api_endpoint do |c|
   c.use Userbin::BasicAuth
   c.use Faraday::Request::UrlEncoded
-  c.use Userbin::ParseSignedJSON
+  c.use Her::Middleware::DefaultParseJSON
+  #c.use Userbin::ParseSignedJSON
   c.use Faraday::Adapter::NetHttp
-  c.use Userbin::VerifySignature
+  #c.use Userbin::VerifySignature
 end
 
 require "userbin/configuration"
@@ -28,7 +29,7 @@ require "userbin/authentication"
 
 class Userbin::Error < Exception; end
 class Userbin::SecurityError < Userbin::Error; end
-class Userbin::UnimplementedError < Userbin::Error; end
+class Userbin::ConfigurationError < Userbin::Error; end
 
 module Userbin
   class << self

data/lib/userbin/authentication.rb

@@ -8,6 +8,10 @@ module Userbin
     end
 
     def call(env)
+      if !Userbin.config.app_id || !Userbin.config.api_secret
+        raise ConfigurationError, "app_id and api_secret must be present"
+      end
+
       request = Rack::Request.new(env)
 
       begin

data/lib/userbin/configuration.rb

@@ -1,22 +1,34 @@
 module Userbin
   class Configuration
-    attr_accessor :app_id
-    attr_accessor :api_secret
-    attr_accessor :skip_script_injection
     attr_accessor :create_user
     attr_accessor :find_user
+    attr_accessor :lock_file
     attr_accessor :protected_path
     attr_accessor :root_path
+    attr_accessor :skip_script_injection
 
     # restricted_path is obsolete
     alias :restricted_path :protected_path
     alias :restricted_path= :protected_path=
 
     def initialize
-      self.app_id = ENV["USERBIN_APP_ID"]
-      self.api_secret = ENV["USERBIN_API_SECRET"]
-
       self.skip_script_injection = false
     end
+
+    def app_id
+      ENV['USERBIN_APP_ID'] || @_app_id
+    end
+
+    def app_id=(value)
+      @_app_id = value
+    end
+
+    def api_secret
+      ENV['USERBIN_API_SECRET'] || @_api_secret
+    end
+
+    def api_secret=(value)
+      @_api_secret = value
+    end
   end
 end

data/lib/userbin/userbin.rb

@@ -64,19 +64,44 @@ module Userbin
   end
 
   def self.current_user
-    if Userbin.config.find_user
-      u = Userbin.config.find_user.call(_current_user.id)
-      return u if u
-      if Userbin.config.create_user
-        u = Userbin.config.create_user.call(_current_user)
-        return u if u
-        _current_user
-      else
-        raise UnimplementedError, "You need to implement create_user"
+    if Userbin.config.lock_file
+      file = File.open(Userbin.config.lock_file, "a+")
+      file.flock(File::LOCK_EX)
+    end
+
+    begin
+      if _current_user
+        if Userbin.config.find_user
+          u = Userbin.config.find_user.call(_current_user.id)
+          if u
+            u
+          else
+            if Userbin.config.create_user
+
+              # Fetch a full profile from the API. This way we can get more
+              # sensitive details than those stored in the cookie. It also checks
+              # that the user still exists in Userbin.
+              profile = User.find(_current_user.id)
+
+              u = Userbin.config.create_user.call(profile)
+              if u
+                u
+              else
+                _current_user
+              end
+            else
+              raise ConfigurationError, "You need to implement create_user"
+            end
+          end
+        else
+          _current_user
+        end
       end
-    else
-      _current_user
+
+    ensure
+      file.flock(File::LOCK_UN) if Userbin.config.lock_file
     end
+
   end
 
   def self.user

data/lib/userbin/version.rb

@@ -1,3 +1,3 @@
 module Userbin
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Johan