cow_auth 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b61a286553d8f86105a6f285edea7f2cdb2834be2083dc6c4cb84cbbec44912
-  data.tar.gz: fe7353598f52d7249a77877772bf41257ffa350c6ea1b78ec3a75b50054dbaf4
+  metadata.gz: 1455b64dcd0206bf8ffd9a4539f4de942952ede5dad80c60b0f86186814735fc
+  data.tar.gz: fc0e8de3a619e761b9fcdc525622d8056f20f939e60592064ada6f76adbcf9a3
 SHA512:
-  metadata.gz: 2783eea610cc94b85cbbf10b54ae242be3b7828617daf48aa04372ffcffdfcb9cd15ab7a30c7cefc7dace3148d5789d74870424ae0b25f577a344b57f1e9203b
-  data.tar.gz: 5e6baa8f5838abc4cbd4518dbc2ce73d50f771c6e04daf99a3b5a3d8d95455b359c642c0fcbc2d0e850b882cccf70c5728cb00da9ddf7af48bd0f0ed4976b057
+  metadata.gz: 5d2fc711916cb332f6279cee78459af32a0610264a95ab4899db92d693d6083acbef67491c2ed296e102f8423b5e0ebd50cabbc749ce3cd61eaa06cdd4bed0d4
+  data.tar.gz: 964cf902670e4f7298b9ba2593e675d7fd00699424c79bc38e6cafb67072b39bb5462e336e1408dbaa7868ab1a70a086952c54220a874cfcf858949610b3d8db

data/Gemfile.lock

@@ -1,57 +1,26 @@
 PATH
   remote: .
   specs:
-    cow_auth (0.5.2)
-      actionpack (~> 5.1)
+    cow_auth (0.5.3)
       activesupport (~> 5.1)
       scrypt (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    builder (3.2.3)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    erubi (1.7.0)
     ffi (1.9.18)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.1.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.3.0)
     minitest (5.11.1)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.3)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
     rake (12.3.0)
     scrypt (3.0.5)
       ffi-compiler (>= 1.0, < 2.0)

data/cow_auth.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'minitest', '~> 5.11'
-  spec.add_runtime_dependency 'actionpack', '~> 5.1'
   spec.add_runtime_dependency 'activesupport', '~> 5.1'
   spec.add_runtime_dependency 'scrypt', '~> 3.0'
 end

data/lib/cow_auth/token_auth/authenticate_request.rb

@@ -4,17 +4,30 @@ module CowAuth
   module TokenAuth
     module AuthenticateRequest
       extend ActiveSupport::Concern
-      include ActionController::HttpAuthentication::Token::ControllerMethods
 
     private
 
+      SID_KEY = 'sid='
+      TOKEN_KEY = 'token='
+      AUTHORIZATION_REGEX = /^(Token|Bearer)\s*/
+      AUTHORIZATION_DELIMITERS = /(?:,|;|\t+)/
+
       def authenticate_user
-        authenticate_or_request_with_http_token do |token, options|
-          user = authentication_class.find_by(sid: options[:sid])
-          @current_user = user.try(:authenticate_with_token, token) ? user : nil
-          raise CowAuth::NotAuthenticatedError.new('User not authenticated.') if @current_user.blank?
-          return true
+        sid, auth_token = extract_credentials(request.authorization)
+        if sid.present? && auth_token.present?
+          user = authentication_class.find_by(sid: sid)
+          @current_user = user.try(:authenticate_with_token, auth_token) ? user : nil
+          return true if @current_user.present?
         end
+        raise CowAuth::NotAuthenticatedError.new('User not authenticated.')
+      end
+
+      def extract_credentials(authorization_header)
+        return nil if authorization_header.blank? || !(authorization_header =~ /\A#{AUTHORIZATION_REGEX}/)
+        params = authorization_header.sub(AUTHORIZATION_REGEX, '').split(/\s*#{AUTHORIZATION_DELIMITERS}\s*/)
+        sid = params[1].sub(SID_KEY, '') if params[1] =~ /\A#{SID_KEY}/
+        auth_token = params[0].sub(TOKEN_KEY, '') if params[0] =~ /\A#{TOKEN_KEY}/
+        return sid, auth_token
       end
 
       def current_user

data/lib/cow_auth/version.rb

@@ -1,3 +1,3 @@
 module CowAuth
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cow_auth
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Mickey Cowden
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement