touth 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 688b4aa6d17d873748b0e566d30fe1a5346bf1dc
-  data.tar.gz: 98a98a22385c71a83f5e2f1f41a34aa639156ea3
+  metadata.gz: f2256629f9eb56b07de8ad4878f8cfde6cbac035
+  data.tar.gz: 8775188762615102ef3715fda39414eded8a8d61
 SHA512:
-  metadata.gz: ade3801f8ed0bb3b8bc29edc1d56c8f58724b96e1a561edc5233491eecf517845d46c6c7f63c6eee9f06a1bb3a09e72223b693b3ba8014fa57d01b73f5b0cdfb
-  data.tar.gz: e83ff2c7a4249a9709b99c5f4563cf93ed6c47a43d945859cef0d6ebc5852ff8a6da55f41c1e2bb64ce1dc5c6434741d444249229e9300161c67db507275d3af
+  metadata.gz: 5935c104873a5badf65c4d31563a649e71d4cb79b22b2820fb7dabd77f615ebe69acd49fb03715587cd806d5922d089f0e906fa0408137fab0b67e50ac0f2e97
+  data.tar.gz: 5977124a908247b182446677eb879cd897b95ac66bf06c51fe6c3903d5d1058cf776aeebfeeed2793f040a779b2315228b3fc598fee72b6add4b21f2b3bb2829

data/lib/touth.rb

@@ -1,17 +1,18 @@
 require 'active_support'
 
+require_relative 'touth/version'
+require_relative 'touth/store'
+require_relative 'touth/authenticator'
+require_relative 'touth/active_record_support'
+require_relative 'touth/action_controller_support'
+require_relative 'touth/middleware'
+require_relative 'touth/railtie' if defined? Rails
+
 
 #  Touth
 #-----------------------------------------------
 module Touth
 
-  extend ActiveSupport::Autoload
-
-  autoload :Authenticator
-  autoload :ActiveRecordSupport
-  autoload :ActionControllerSupport
-  autoload :VERSION
-
   class Configuration
 
     attr_accessor :access_token_lifetime,
@@ -31,7 +32,6 @@ module Touth
   end
 
   class InvalidAccessTokenError < StandardError; end
-  class ResourceConflictError < StandardError; end
 
   class << self
 
@@ -77,6 +77,7 @@ ActiveSupport.on_load(:action_controller) do
   extend Touth::ActionControllerSupport::ClassMethods
   include Touth::ActionControllerSupport::InstanceMethods
 end
+
 ActiveSupport.on_load(:active_record) do
   extend Touth::ActiveRecordSupport::ClassMethods
 end

data/lib/touth/action_controller_support.rb

@@ -2,11 +2,7 @@ module Touth
   module ActionControllerSupport
     module ClassMethods
 
-      mattr_accessor :token_authorized_resources
-
       def token_authentication_for(resource_name)
-        self.token_authorized_resources ||= {}
-
         unless @_init_token_authenticator_hook
           prepend_before_action :set_token_authorized_resource!
           @_init_token_authenticator_hook = true
@@ -17,11 +13,11 @@ module Touth
 
         unless method_defined? callback_name
           define_method "#{resource_name}_signed_in?" do
-            !!self.class.token_authorized_resources[resource_name]
+            !!Touth::Authenticator.current(resource_name)
           end
 
           define_method "current_#{resource_name}" do
-            self.class.token_authorized_resources[resource_name]
+            Touth::Authenticator.current resource_name
           end
 
           define_method callback_name do
@@ -42,16 +38,11 @@ module Touth
       def set_token_authorized_resource!
         token = request.headers[Touth.header_name]
 
-        return unless token && Authenticator.valid_access_token?(token)
-
-        resource = Authenticator.get_resource token
-        resource_name = Touth.get_resource_name resource.class.name
-
-        self.class.token_authorized_resources[resource_name] = resource
+        Authenticator.set_current Authenticator.get_resource(token)
       end
 
       def authenticate_token_for!(resource_name)
-        unless self.class.token_authorized_resources[resource_name]
+        unless Touth::Authenticator.current resource_name
           if Touth.allow_raise
             raise InvalidAccessTokenError, 'access token is not valid'
           else

data/lib/touth/authenticator.rb

@@ -1,59 +1,75 @@
+require 'base64'
+
+
 module Touth
   module Authenticator
+    class << self
 
-  module_function
+      def issue_access_token(resource, lifetime = Touth.access_token_lifetime)
+        expires_at = Time.now.to_i + lifetime
 
-    def issue_access_token(resource, lifetime = Touth.access_token_lifetime)
-      expires_at = Time.now.to_i + lifetime
+        data = Marshal.dump({
+          class:      resource.class,
+          id:         resource.id,
+          secret:     token_secret(resource),
+          expires_at: expires_at,
+        })
 
-      data = Marshal.dump([
-        resource.class,
-        resource.id,
-        expires_at,
-      ])
+        data_sign = Touth.digest data
 
-      data_sign = Touth.digest data
-      data_key = gen_data_key resource, data_sign
+        Base64.urlsafe_encode64 [
+          data,
+          data_sign,
+        ].join
+      end
 
-      [
-        data_sign,
-        data_key,
-        data,
-      ].join.unpack('H*')[0]
-    end
+      def valid_access_token?(token)
+        !!get_resource(token)
+      end
 
-    def valid_access_token?(token)
-      !!get_resource(token)
-    end
+      def get_resource(token)
+        return unless token
 
-    def get_resource(token)
-      @access_token_data_cache ||= {}
-      resource = @access_token_data_cache[token]
+        resource = Store.access_tokens[token]
 
-      return resource if resource
+        return resource if resource
 
-      @access_token_data_cache[token] = nil
+        Store.access_tokens[token] = nil
 
-      begin
-        data_sign, data_key, data = [token].pack('H*').unpack 'A32A32A*'
+        begin
+          data = Base64.urlsafe_decode64(token)
+          data_sign = data.slice! -32..-1
 
-        if data_sign == Touth.digest(data)
-          resource_class, id, expires_at = Marshal.load data
+          if data_sign == Touth.digest(data)
+            data = Marshal.load data
 
-          resource = resource_class.find id
+            resource = data[:class].find data[:id]
 
-          if gen_data_key(resource, data_sign) == data_key && Time.now.to_i < expires_at
-            @access_token_data_cache[token] = resource
+            if token_secret(resource) == data[:secret] && Time.now.to_i < data[:expires_at]
+              Store.access_tokens[token] = resource
+            end
           end
+        rescue
+          nil
         end
-      rescue
-        nil
       end
-    end
 
-    def gen_data_key(resource, data_sign)
-      Touth.digest [data_sign, resource.send(Touth.password_field)].join
-    end
+      def token_secret(resource)
+        password = resource.send Touth.password_field
+        Touth.digest(password)[0..16]
+      end
+
+      def set_current(resource)
+        return unless resource
+
+        resource_name = Touth.get_resource_name resource.class.name
+        Store.currents[resource_name] = resource
+      end
 
+      def current(resource_name)
+        Store.currents[resource_name]
+      end
+
+    end
   end
 end

data/lib/touth/middleware.rb

@@ -0,0 +1,15 @@
+module Touth
+  class Middleware
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call env
+    ensure
+      Store.clear!
+    end
+
+  end
+end

data/lib/touth/railtie.rb

@@ -0,0 +1,11 @@
+module Touth
+  class Railtie < ::Rails::Railtie
+    initializer 'request_store.insert_middleware' do |app|
+      if ActionDispatch.const_defined? :RequestId
+        app.config.middleware.insert_after ActionDispatch::RequestId, Touth::Middleware
+      else
+        app.config.middleware.insert_after Rack::MethodOverride, Touth::Middleware
+      end
+    end
+  end
+end

data/lib/touth/store.rb

@@ -0,0 +1,24 @@
+module Touth
+  module Store
+
+    ACCESS_TOKENS_STORE_KEY = :touth_access_tokens_store
+    CURRENTS_STORE_KEY      = :touth_currents_store
+
+    class << self
+
+      def access_tokens
+        Thread.current[ACCESS_TOKENS_STORE_KEY] ||= {}
+      end
+
+      def currents
+        Thread.current[CURRENTS_STORE_KEY] ||= {}
+      end
+
+      def clear!
+        Thread.current[ACCESS_TOKENS_STORE_KEY] = {}
+        Thread.current[CURRENTS_STORE_KEY] = {}
+      end
+
+    end
+  end
+end

data/lib/touth/version.rb

@@ -1,3 +1,9 @@
 module Touth
-  VERSION = '1.2.0'
+
+  MAJOR    = 1
+  MINOR    = 3
+  REVISION = 0
+
+  VERSION = [MAJOR, MINOR, REVISION].compact.join '.'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: touth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,9 @@ files:
 - lib/touth/action_controller_support.rb
 - lib/touth/active_record_support.rb
 - lib/touth/authenticator.rb
+- lib/touth/middleware.rb
+- lib/touth/railtie.rb
+- lib/touth/store.rb
 - lib/touth/version.rb
 - touth.gemspec
 homepage: https://github.com/creasty/touth