Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2ed66fea
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,发现更多精彩内容 >>
提交
2ed66fea
编写于
10月 09, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3262 from subdigital/master
Add optional host option to force_ssl
上级
501e5b0d
d68f27e9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
3 deletion
+26
-3
actionpack/lib/action_controller/metal/force_ssl.rb
actionpack/lib/action_controller/metal/force_ssl.rb
+5
-2
actionpack/test/controller/force_ssl_test.rb
actionpack/test/controller/force_ssl_test.rb
+21
-1
未找到文件。
actionpack/lib/action_controller/metal/force_ssl.rb
浏览文件 @
2ed66fea
...
...
@@ -24,9 +24,12 @@ module ClassMethods
# * <tt>only</tt> - The callback should be run only for this action
# * <tt>except<tt> - The callback should be run for all actions except this action
def
force_ssl
(
options
=
{})
host
=
options
.
delete
(
:host
)
before_filter
(
options
)
do
if
!
request
.
ssl?
&&
!
Rails
.
env
.
development?
redirect_to
:protocol
=>
'https://'
,
:status
=>
:moved_permanently
redirect_options
=
{
:protocol
=>
'https://'
,
:status
=>
:moved_permanently
}
redirect_options
.
merge!
(
:host
=>
host
)
if
host
redirect_to
redirect_options
end
end
end
...
...
actionpack/test/controller/force_ssl_test.rb
浏览文件 @
2ed66fea
...
...
@@ -14,6 +14,10 @@ class ForceSSLControllerLevel < ForceSSLController
force_ssl
end
class
ForceSSLCustomDomain
<
ForceSSLController
force_ssl
:host
=>
"secure.test.host"
end
class
ForceSSLOnlyAction
<
ForceSSLController
force_ssl
:only
=>
:cheeseburger
end
...
...
@@ -38,6 +42,22 @@ def test_cheeseburger_redirects_to_https
end
end
class
ForceSSLCustomDomainTest
<
ActionController
::
TestCase
tests
ForceSSLCustomDomain
def
test_banana_redirects_to_https_with_custom_host
get
:banana
assert_response
301
assert_equal
"https://secure.test.host/force_ssl_custom_domain/banana"
,
redirect_to_url
end
def
test_cheeseburger_redirects_to_https_with_custom_host
get
:cheeseburger
assert_response
301
assert_equal
"https://secure.test.host/force_ssl_custom_domain/cheeseburger"
,
redirect_to_url
end
end
class
ForceSSLOnlyActionTest
<
ActionController
::
TestCase
tests
ForceSSLOnlyAction
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录