Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ec0973c2
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,发现更多精彩内容 >>
提交
ec0973c2
编写于
3月 10, 2010
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove uneeded methods.
上级
bbc4de75
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
4 addition
and
33 deletion
+4
-33
actionpack/lib/action_controller/metal/http_authentication.rb
...onpack/lib/action_controller/metal/http_authentication.rb
+4
-18
actionpack/lib/action_dispatch/http/mime_negotiation.rb
actionpack/lib/action_dispatch/http/mime_negotiation.rb
+0
-15
未找到文件。
actionpack/lib/action_controller/metal/http_authentication.rb
浏览文件 @
ec0973c2
...
...
@@ -124,7 +124,7 @@ def request_http_basic_authentication(realm = "Application")
end
def
authenticate
(
request
,
&
login_procedure
)
unless
authorization
(
request
)
.
blank?
unless
request
.
authorization
.
blank?
login_procedure
.
call
(
*
user_name_and_password
(
request
))
end
end
...
...
@@ -133,15 +133,8 @@ def user_name_and_password(request)
decode_credentials
(
request
).
split
(
/:/
,
2
)
end
def
authorization
(
request
)
request
.
env
[
'HTTP_AUTHORIZATION'
]
||
request
.
env
[
'X-HTTP_AUTHORIZATION'
]
||
request
.
env
[
'X_HTTP_AUTHORIZATION'
]
||
request
.
env
[
'REDIRECT_X_HTTP_AUTHORIZATION'
]
end
def
decode_credentials
(
request
)
ActiveSupport
::
Base64
.
decode64
(
authorization
(
request
)
.
split
(
' '
,
2
).
last
||
''
)
ActiveSupport
::
Base64
.
decode64
(
request
.
authorization
.
split
(
' '
,
2
).
last
||
''
)
end
def
encode_credentials
(
user_name
,
password
)
...
...
@@ -176,14 +169,7 @@ def request_http_digest_authentication(realm = "Application", message = nil)
# Returns false on a valid response, true otherwise
def
authenticate
(
secret_key
,
request
,
realm
,
&
password_procedure
)
authorization
(
request
)
&&
validate_digest_response
(
secret_key
,
request
,
realm
,
&
password_procedure
)
end
def
authorization
(
request
)
request
.
env
[
'HTTP_AUTHORIZATION'
]
||
request
.
env
[
'X-HTTP_AUTHORIZATION'
]
||
request
.
env
[
'X_HTTP_AUTHORIZATION'
]
||
request
.
env
[
'REDIRECT_X_HTTP_AUTHORIZATION'
]
request
.
authorization
&&
validate_digest_response
(
secret_key
,
request
,
realm
,
&
password_procedure
)
end
# Returns false unless the request credentials response value matches the expected value.
...
...
@@ -226,7 +212,7 @@ def encode_credentials(http_method, credentials, password, password_is_ha1)
end
def
decode_credentials_header
(
request
)
decode_credentials
(
authorization
(
request
)
)
decode_credentials
(
request
.
authorization
)
end
def
decode_credentials
(
header
)
...
...
actionpack/lib/action_dispatch/http/mime_negotiation.rb
浏览文件 @
ec0973c2
...
...
@@ -67,21 +67,6 @@ def format=(extension)
@env
[
"action_dispatch.request.formats"
]
=
[
Mime
::
Type
.
lookup_by_extension
(
parameters
[
:format
])]
end
# Returns a symbolized version of the <tt>:format</tt> parameter of the request.
# If no \format is given it returns <tt>:js</tt>for Ajax requests and <tt>:html</tt>
# otherwise.
def
template_format
parameter_format
=
parameters
[
:format
]
if
parameter_format
parameter_format
elsif
xhr?
:js
else
:html
end
end
# Receives an array of mimes and return the first user sent mime that
# matches the order array.
#
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录