rack-protection 2.0.0.beta2 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8577a28a79d48600a61b507f03677aab4a00e21
-  data.tar.gz: e6db383a9598a41a22725c522e78e319a0236189
+  metadata.gz: 7866e19271188b3c5668af566e5d61f305d7ebfd
+  data.tar.gz: 3cbee3fe323d7dbf531741731cda60dfe76b451e
 SHA512:
-  metadata.gz: 16061dd9bbf90d1dd9ccc30f0bfbb97df23c2abdcd6fbc02403579fd68ac369e35aff61ed789a2b780f4ee308409aa45f7a9c545e95f89da8daccd81b984b243
-  data.tar.gz: 3a838ee68a0613f39fc4e524644eb1a5283a340b05604ad603b41086b293d3864389b97f534f4383f306f65cabd3024527eb0fe4c4df39a78e58a09ee37e8329
+  metadata.gz: d740e0613f51e92b942e33611f29f317dd197be142818724c67a06be9536dbdba2d1e7b890d0f7444db6c804e4e77d9f156ab392ab503481985bd7481e6d3beb
+  data.tar.gz: ca24a69a0ef6b19bb3087d6c60f70ff51043e3e8ab7da691ab2311d2d7da73129e24c5adacbd37ce9b9436ee8541f29b2c96d98b6276e8373f00d0754860ed08

data/lib/rack/protection/authenticity_token.rb

@@ -12,65 +12,28 @@ module Rack
     # Only accepts unsafe HTTP requests if a given access token matches the token
     # included in the session.
     #
-    # Compatible with Rails and rack-csrf.
+    # Compatible with rack-csrf.
     #
     # Options:
     #
     # authenticity_param: Defines the param's name that should contain the token on a request.
-    #
     class AuthenticityToken < Base
+      TOKEN_LENGTH = 32
+
       default_options :authenticity_param => 'authenticity_token',
-                      :authenticity_token_length => 32,
                       :allow_if => nil
 
-      class << self
-        def token(session)
-          mask_token(session[:csrf])
-        end
-
-        def random_token(length = 32)
-          SecureRandom.base64(length)
-        end
-
-        # Creates a masked version of the authenticity token that varies
-        # on each request. The masking is used to mitigate SSL attacks
-        # like BREACH.
-        def mask_token(token)
-          token = decode_token(token)
-          one_time_pad = SecureRandom.random_bytes(token.length)
-          encrypted_token = xor_byte_strings(one_time_pad, token)
-          masked_token = one_time_pad + encrypted_token
-          encode_token masked_token
-        end
-
-        # Essentially the inverse of +mask_token+.
-        def unmask_decoded_token(masked_token)
-          # Split the token into the one-time pad and the encrypted
-          # value and decrypt it
-          token_length = masked_token.length / 2
-          one_time_pad = masked_token[0...token_length]
-          encrypted_token = masked_token[token_length..-1]
-          xor_byte_strings(one_time_pad, encrypted_token)
-        end
-
-        def encode_token(token)
-          Base64.strict_encode64(token)
-        end
-
-        def decode_token(token)
-          Base64.strict_decode64(token)
-        end
-
-        private
+      def self.token(session)
+        self.new(nil).mask_authenticity_token(session)
+      end
 
-        def xor_byte_strings(s1, s2)
-          s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*')
-        end
+      def self.random_token
+        SecureRandom.base64(TOKEN_LENGTH)
       end
 
       def accepts?(env)
         session = session env
-        session[:csrf] ||= self.class.random_token(token_length)
+        set_token(session)
 
         safe?(env) ||
           valid_token?(session, env['HTTP_X_CSRF_TOKEN']) ||
@@ -78,10 +41,15 @@ module Rack
           ( options[:allow_if] && options[:allow_if].call(env) )
       end
 
+      def mask_authenticity_token(session)
+        token = set_token(session)
+        mask_token(token)
+      end
+
       private
 
-      def token_length
-        options[:authenticity_token_length]
+      def set_token(session)
+        session[:csrf] ||= self.class.random_token
       end
 
       # Checks the client's masked token to see if it matches the
@@ -90,7 +58,7 @@ module Rack
         return false if token.nil? || token.empty?
 
         begin
-          token = self.class.decode_token(token)
+          token = decode_token(token)
         rescue ArgumentError # encoded_masked_token is invalid Base64
           return false
         end
@@ -102,7 +70,7 @@ module Rack
           compare_with_real_token token, session
 
         elsif masked_token?(token)
-          token = self.class.unmask_decoded_token(token)
+          token = unmask_token(token)
 
           compare_with_real_token token, session
 
@@ -111,12 +79,33 @@ module Rack
         end
       end
 
+      # Creates a masked version of the authenticity token that varies
+      # on each request. The masking is used to mitigate SSL attacks
+      # like BREACH.
+      def mask_token(token)
+        token = decode_token(token)
+        one_time_pad = SecureRandom.random_bytes(token.length)
+        encrypted_token = xor_byte_strings(one_time_pad, token)
+        masked_token = one_time_pad + encrypted_token
+        encode_token(masked_token)
+      end
+
+      # Essentially the inverse of +mask_token+.
+      def unmask_token(masked_token)
+        # Split the token into the one-time pad and the encrypted
+        # value and decrypt it
+        token_length = masked_token.length / 2
+        one_time_pad = masked_token[0...token_length]
+        encrypted_token = masked_token[token_length..-1]
+        xor_byte_strings(one_time_pad, encrypted_token)
+      end
+
       def unmasked_token?(token)
-        token.length == token_length
+        token.length == TOKEN_LENGTH
       end
 
       def masked_token?(token)
-        token.length == token_length * 2
+        token.length == TOKEN_LENGTH * 2
       end
 
       def compare_with_real_token(token, session)
@@ -124,7 +113,19 @@ module Rack
       end
 
       def real_token(session)
-        self.class.decode_token(session[:csrf])
+        decode_token(session[:csrf])
+      end
+
+      def encode_token(token)
+        Base64.strict_encode64(token)
+      end
+
+      def decode_token(token)
+        Base64.strict_decode64(token)
+      end
+
+      def xor_byte_strings(s1, s2)
+        s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*')
       end
     end
   end

data/lib/rack/protection/form_token.rb

@@ -13,7 +13,7 @@ module Rack
     # This middleware is not used when using the Rack::Protection collection,
     # since it might be a security issue, depending on your application
     #
-    # Compatible with Rails and rack-csrf.
+    # Compatible with rack-csrf.
     class FormToken < AuthenticityToken
       def accepts?(env)
         env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" or super

data/lib/rack/protection/remote_token.rb

@@ -10,7 +10,7 @@ module Rack
     # Only accepts unsafe HTTP requests if a given access token matches the token
     # included in the session *or* the request comes from the same origin.
     #
-    # Compatible with Rails and rack-csrf.
+    # Compatible with rack-csrf.
     class RemoteToken < AuthenticityToken
       default_reaction :deny
 

data/lib/rack/protection/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Protection
-    VERSION = "2.0.0.beta2"
+    VERSION = "2.0.0.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-protection
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -41,7 +41,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -141,4 +141,3 @@ specification_version: 4
 summary: Protect against typical web attacks, works with all Rack apps, including
   Rails.
 test_files: []
-has_rdoc: