aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/http_authentication.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-12-15 10:59:54 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-12-15 10:59:54 -0700
commit1ad94e760d7a0f4288fb6d29114176b2e5dde250 (patch)
tree1bc9beb922b9c2165e618e44a3cfd57cd65b907f /actionpack/lib/action_controller/metal/http_authentication.rb
parentdc3d3fb0b97d3be0501d66ba71a71611cf942b2b (diff)
parentd5a0d71037921320210ab719921c9ba621b98ec2 (diff)
downloadrails-1ad94e760d7a0f4288fb6d29114176b2e5dde250.tar.gz
rails-1ad94e760d7a0f4288fb6d29114176b2e5dde250.tar.bz2
rails-1ad94e760d7a0f4288fb6d29114176b2e5dde250.zip
Merge pull request #14212 from tylerhunt/fix-token-regex
Handle tab in token authentication header.
Diffstat (limited to 'actionpack/lib/action_controller/metal/http_authentication.rb')
-rw-r--r--actionpack/lib/action_controller/metal/http_authentication.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 0a36fecd27..2ac6e37e34 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -397,7 +397,7 @@ module ActionController
# RewriteRule ^(.*)$ dispatch.fcgi [E=X-HTTP_AUTHORIZATION:%{HTTP:Authorization},QSA,L]
module Token
TOKEN_KEY = 'token='
- TOKEN_REGEX = /^(Token|Bearer) /
+ TOKEN_REGEX = /^(Token|Bearer)\s+/
AUTHN_PAIR_DELIMITERS = /(?:,|;|\t+)/
extend self