Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0b2dd7af
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
GitCode(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0b2dd7af
编写于
10月 28, 2009
作者:
Y
Yehuda Katz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reorganize CSRF a bit
上级
cbcb947b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
33 deletion
+27
-33
actionpack/lib/action_controller/metal/request_forgery_protection.rb
...lib/action_controller/metal/request_forgery_protection.rb
+23
-33
actionpack/lib/action_dispatch/http/request.rb
actionpack/lib/action_dispatch/http/request.rb
+4
-0
未找到文件。
actionpack/lib/action_controller/metal/request_forgery_protection.rb
浏览文件 @
0b2dd7af
...
...
@@ -5,7 +5,6 @@ class InvalidAuthenticityToken < ActionControllerError #:nodoc:
module
RequestForgeryProtection
extend
ActiveSupport
::
Concern
# TODO : Remove the defined? check when new base is the main base
include
AbstractController
::
Helpers
,
Session
included
do
...
...
@@ -21,26 +20,26 @@ module RequestForgeryProtection
helper_method
:protect_against_forgery?
end
# Protecting controller actions from CSRF attacks by ensuring that all forms are coming from the current web application, not a
# forged link from another site, is done by embedding a token based on a random string stored in the session (which an attacker wouldn't know) in all
# forms and Ajax requests generated by Rails and then verifying the authenticity of that token in the controller. Only
# HTML/JavaScript requests are checked, so this will not protect your XML API (presumably you'll have a different authentication
# scheme there anyway). Also, GET requests are not protected as these should be idempotent anyway.
# Protecting controller actions from CSRF attacks by ensuring that all forms are coming from the current
# web application, not a forged link from another site, is done by embedding a token based on a random
# string stored in the session (which an attacker wouldn't know) in all forms and Ajax requests generated
# by Rails and then verifying the authenticity of that token in the controller. Only HTML/JavaScript
# requests are checked, so this will not protect your XML API (presumably you'll have a different
# authentication scheme there anyway). Also, GET requests are not protected as these should be
# idempotent anyway.
#
# This is turned on with the <tt>protect_from_forgery</tt> method, which will check the token and raise an
# ActionController::InvalidAuthenticityToken if it doesn't match what was expected. You can customize the
error message in
#
production by editing public/422.html. A call to this method in ApplicationController is generated by default in post-Rails 2.0
# applications.
# ActionController::InvalidAuthenticityToken if it doesn't match what was expected. You can customize the
#
error message in production by editing public/422.html. A call to this method in ApplicationController is
#
generated by default in post-Rails 2.0
applications.
#
# The token parameter is named <tt>authenticity_token</tt> by default. If you are generating an HTML form
manually (without the
#
use of Rails' <tt>form_for</tt>, <tt>form_tag</tt> or other helpers), you have to include a hidden field named like that and
#
set its value to what is returned by <tt>form_authenticity_token</tt>. Same applies to manually constructed Ajax requests. To
#
make the token available through a global variable to scripts on a certain page, you could add something like this to a view:
# The token parameter is named <tt>authenticity_token</tt> by default. If you are generating an HTML form
#
manually (without the use of Rails' <tt>form_for</tt>, <tt>form_tag</tt> or other helpers), you have to
#
include a hidden field named like that and set its value to what is returned by
#
<tt>form_authenticity_token</tt>.
#
# <%= javascript_tag "window._token = '#{form_authenticity_token}'" %>
#
# Request forgery protection is disabled by default in test environment. If you are upgrading from Rails 1.x, add this to
# config/environments/test.rb:
# Request forgery protection is disabled by default in test environment. If you are upgrading from Rails
# 1.x, add this to config/environments/test.rb:
#
# # Disable request forgery protection in test environment
# config.action_controller.allow_forgery_protection = false
...
...
@@ -57,7 +56,8 @@ module RequestForgeryProtection
# * Keep your GET requests safe and idempotent. More reading material:
# * http://www.xml.com/pub/a/2002/04/24/deviant.html
# * http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.1
# * Make sure the session cookies that Rails creates are non-persistent. Check in Firefox and look for "Expires: at end of session"
# * Make sure the session cookies that Rails creates are non-persistent. Check in Firefox and look
# for "Expires: at end of session"
#
module
ClassMethods
# Turn on request forgery protection. Bear in mind that only non-GET, HTML/JavaScript requests are checked.
...
...
@@ -76,10 +76,7 @@ module ClassMethods
# * <tt>:only/:except</tt> - Passed to the <tt>before_filter</tt> call. Set which actions are verified.
def
protect_from_forgery
(
options
=
{})
self
.
request_forgery_protection_token
||=
:authenticity_token
before_filter
:verify_authenticity_token
,
:only
=>
options
.
delete
(
:only
),
:except
=>
options
.
delete
(
:except
)
if
options
[
:secret
]
||
options
[
:digest
]
ActiveSupport
::
Deprecation
.
warn
(
"protect_from_forgery only takes :only and :except options now. :digest and :secret have no effect"
,
caller
)
end
before_filter
:verify_authenticity_token
,
options
end
end
...
...
@@ -88,31 +85,24 @@ def protect_from_forgery(options = {})
def
verify_authenticity_token
verified_request?
||
raise
(
ActionController
::
InvalidAuthenticityToken
)
end
# Returns true or false if a request is verified. Checks:
#
# * is the format restricted? By default, only HTML requests are checked.
# * is it a GET request? Gets should be safe and idempotent
# * Does the form_authenticity_token match the given token value from the params?
def
verified_request?
!
protect_against_forgery?
||
request
.
method
==
:get
||
request
.
xhr?
||
!
verifiable_request_format?
||
!
protect_against_forgery?
||
request
.
forgery_whitelisted?
||
form_authenticity_token
==
params
[
request_forgery_protection_token
]
end
def
verifiable_request_format?
!
request
.
content_type
.
nil?
&&
request
.
content_type
.
verify_request?
end
# Sets the token value for the current session.
def
form_authenticity_token
session
[
:_csrf_token
]
||=
ActiveSupport
::
SecureRandom
.
base64
(
32
)
end
def
protect_against_forgery?
allow_forgery_protection
&&
request_forgery_protection_token
allow_forgery_protection
end
end
end
actionpack/lib/action_dispatch/http/request.rb
浏览文件 @
0b2dd7af
...
...
@@ -97,6 +97,10 @@ def content_type
end
end
def
forgery_whitelisted?
method
==
:get
||
xhr?
||
!
(
!
content_type
.
nil?
&&
content_type
.
verify_request?
)
end
def
media_type
content_type
.
to_s
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录