Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8ef1ef1b
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,发现更多精彩内容 >>
提交
8ef1ef1b
编写于
12月 06, 2013
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10635 from vipulnsward/change_to_strict
Use `Base.strict_decode64` instead of `Base.decode64`
上级
747c616a
a4e1e5d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
5 deletion
+20
-5
activesupport/lib/active_support/message_encryptor.rb
activesupport/lib/active_support/message_encryptor.rb
+3
-3
activesupport/lib/active_support/message_verifier.rb
activesupport/lib/active_support/message_verifier.rb
+5
-1
activesupport/test/message_encryptor_test.rb
activesupport/test/message_encryptor_test.rb
+12
-1
未找到文件。
activesupport/lib/active_support/message_encryptor.rb
浏览文件 @
8ef1ef1b
...
@@ -76,12 +76,12 @@ def _encrypt(value)
...
@@ -76,12 +76,12 @@ def _encrypt(value)
encrypted_data
=
cipher
.
update
(
@serializer
.
dump
(
value
))
encrypted_data
=
cipher
.
update
(
@serializer
.
dump
(
value
))
encrypted_data
<<
cipher
.
final
encrypted_data
<<
cipher
.
final
[
encrypted_data
,
iv
].
map
{
|
v
|
::
Base64
.
strict_encode64
(
v
)}.
join
(
"--"
)
"
#{
::
Base64
.
strict_encode64
encrypted_data
}
--
#{
::
Base64
.
strict_encode64
iv
}
"
end
end
def
_decrypt
(
encrypted_message
)
def
_decrypt
(
encrypted_message
)
cipher
=
new_cipher
cipher
=
new_cipher
encrypted_data
,
iv
=
encrypted_message
.
split
(
"--"
).
map
{
|
v
|
::
Base64
.
decode64
(
v
)}
encrypted_data
,
iv
=
encrypted_message
.
split
(
"--"
).
map
{
|
v
|
::
Base64
.
strict_
decode64
(
v
)}
cipher
.
decrypt
cipher
.
decrypt
cipher
.
key
=
@secret
cipher
.
key
=
@secret
...
@@ -91,7 +91,7 @@ def _decrypt(encrypted_message)
...
@@ -91,7 +91,7 @@ def _decrypt(encrypted_message)
decrypted_data
<<
cipher
.
final
decrypted_data
<<
cipher
.
final
@serializer
.
load
(
decrypted_data
)
@serializer
.
load
(
decrypted_data
)
rescue
OpenSSLCipherError
,
TypeError
rescue
OpenSSLCipherError
,
TypeError
,
ArgumentError
raise
InvalidMessage
raise
InvalidMessage
end
end
...
...
activesupport/lib/active_support/message_verifier.rb
浏览文件 @
8ef1ef1b
...
@@ -37,7 +37,11 @@ def verify(signed_message)
...
@@ -37,7 +37,11 @@ def verify(signed_message)
data
,
digest
=
signed_message
.
split
(
"--"
)
data
,
digest
=
signed_message
.
split
(
"--"
)
if
data
.
present?
&&
digest
.
present?
&&
secure_compare
(
digest
,
generate_digest
(
data
))
if
data
.
present?
&&
digest
.
present?
&&
secure_compare
(
digest
,
generate_digest
(
data
))
@serializer
.
load
(
::
Base64
.
decode64
(
data
))
begin
@serializer
.
load
(
::
Base64
.
strict_decode64
(
data
))
rescue
ArgumentError
raise
InvalidSignature
end
else
else
raise
InvalidSignature
raise
InvalidSignature
end
end
...
...
activesupport/test/message_encryptor_test.rb
浏览文件 @
8ef1ef1b
...
@@ -66,6 +66,17 @@ def test_alternative_serialization_method
...
@@ -66,6 +66,17 @@ def test_alternative_serialization_method
ActiveSupport
.
use_standard_json_time_format
=
prev
ActiveSupport
.
use_standard_json_time_format
=
prev
end
end
def
test_message_obeys_strict_encoding
bad_encoding_characters
=
"
\n
!@#"
message
,
iv
=
@encryptor
.
encrypt_and_sign
(
"This is a very
\n\n
humble string"
+
bad_encoding_characters
)
assert_not_decrypted
(
"
#{
::
Base64
.
encode64
message
.
to_s
}
--
#{
::
Base64
.
encode64
iv
.
to_s
}
"
)
assert_not_verified
(
"
#{
::
Base64
.
encode64
message
.
to_s
}
--
#{
::
Base64
.
encode64
iv
.
to_s
}
"
)
assert_not_decrypted
([
iv
,
message
]
*
bad_encoding_characters
)
assert_not_verified
([
iv
,
message
]
*
bad_encoding_characters
)
end
private
private
def
assert_not_decrypted
(
value
)
def
assert_not_decrypted
(
value
)
...
@@ -81,7 +92,7 @@ def assert_not_verified(value)
...
@@ -81,7 +92,7 @@ def assert_not_verified(value)
end
end
def
munge
(
base64_string
)
def
munge
(
base64_string
)
bits
=
::
Base64
.
decode64
(
base64_string
)
bits
=
::
Base64
.
strict_
decode64
(
base64_string
)
bits
.
reverse!
bits
.
reverse!
::
Base64
.
strict_encode64
(
bits
)
::
Base64
.
strict_encode64
(
bits
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录