Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a730bf47
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a730bf47
编写于
10月 20, 2011
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LocaleEditor and StringToLocaleConverter do not restrict variant part through validation (SPR-8637)
上级
b5ec65ce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
10 deletion
+43
-10
org.springframework.core/src/main/java/org/springframework/util/StringUtils.java
...e/src/main/java/org/springframework/util/StringUtils.java
+12
-7
org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
.../test/java/org/springframework/util/StringUtilsTests.java
+31
-3
未找到文件。
org.springframework.core/src/main/java/org/springframework/util/StringUtils.java
浏览文件 @
a730bf47
...
...
@@ -665,16 +665,11 @@ public abstract class StringUtils {
* @return a corresponding <code>Locale</code> instance
*/
public
static
Locale
parseLocaleString
(
String
localeString
)
{
for
(
int
i
=
0
;
i
<
localeString
.
length
();
i
++)
{
char
ch
=
localeString
.
charAt
(
i
);
if
(
ch
!=
'_'
&&
ch
!=
' '
&&
!
Character
.
isLetterOrDigit
(
ch
))
{
throw
new
IllegalArgumentException
(
"Locale value \""
+
localeString
+
"\" contains invalid characters"
);
}
}
String
[]
parts
=
tokenizeToStringArray
(
localeString
,
"_ "
,
false
,
false
);
String
language
=
(
parts
.
length
>
0
?
parts
[
0
]
:
""
);
String
country
=
(
parts
.
length
>
1
?
parts
[
1
]
:
""
);
validateLocalePart
(
language
);
validateLocalePart
(
country
);
String
variant
=
""
;
if
(
parts
.
length
>=
2
)
{
// There is definitely a variant, and it is everything after the country
...
...
@@ -689,6 +684,16 @@ public abstract class StringUtils {
return
(
language
.
length
()
>
0
?
new
Locale
(
language
,
country
,
variant
)
:
null
);
}
private
static
void
validateLocalePart
(
String
localePart
)
{
for
(
int
i
=
0
;
i
<
localePart
.
length
();
i
++)
{
char
ch
=
localePart
.
charAt
(
i
);
if
(
ch
!=
'_'
&&
ch
!=
' '
&&
!
Character
.
isLetterOrDigit
(
ch
))
{
throw
new
IllegalArgumentException
(
"Locale part \""
+
localePart
+
"\" contains invalid characters"
);
}
}
}
/**
* Determine the RFC 3066 compliant language tag,
* as used for the HTTP "Accept-Language" header.
...
...
org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
浏览文件 @
a730bf47
/*
* Copyright 2002-20
08
the original author or authors.
* Copyright 2002-20
11
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -268,21 +268,26 @@ public class StringUtilsTests extends TestCase {
assertEquals
(
null
,
StringUtils
.
getFilenameExtension
(
""
));
assertEquals
(
null
,
StringUtils
.
getFilenameExtension
(
"myfile"
));
assertEquals
(
null
,
StringUtils
.
getFilenameExtension
(
"myPath/myfile"
));
assertEquals
(
null
,
StringUtils
.
getFilenameExtension
(
"/home/user/.m2/settings/myfile"
));
assertEquals
(
""
,
StringUtils
.
getFilenameExtension
(
"myfile."
));
assertEquals
(
""
,
StringUtils
.
getFilenameExtension
(
"myPath/myfile."
));
assertEquals
(
"txt"
,
StringUtils
.
getFilenameExtension
(
"myfile.txt"
));
assertEquals
(
"txt"
,
StringUtils
.
getFilenameExtension
(
"mypath/myfile.txt"
));
assertEquals
(
"txt"
,
StringUtils
.
getFilenameExtension
(
"/home/user/.m2/settings/myfile.txt"
));
}
public
void
testStripFilenameExtension
()
{
assertEquals
(
null
,
StringUtils
.
stripFilenameExtension
(
null
));
assertEquals
(
""
,
StringUtils
.
stripFilenameExtension
(
""
));
assertEquals
(
"myfile"
,
StringUtils
.
stripFilenameExtension
(
"myfile"
));
assertEquals
(
"mypath/myfile"
,
StringUtils
.
stripFilenameExtension
(
"mypath/myfile"
));
assertEquals
(
"myfile"
,
StringUtils
.
stripFilenameExtension
(
"myfile."
));
assertEquals
(
"mypath/myfile"
,
StringUtils
.
stripFilenameExtension
(
"mypath/myfile."
));
assertEquals
(
"myfile"
,
StringUtils
.
stripFilenameExtension
(
"myfile.txt"
));
assertEquals
(
"mypath/myfile"
,
StringUtils
.
stripFilenameExtension
(
"mypath/myfile"
));
assertEquals
(
"mypath/myfile"
,
StringUtils
.
stripFilenameExtension
(
"mypath/myfile."
));
assertEquals
(
"mypath/myfile"
,
StringUtils
.
stripFilenameExtension
(
"mypath/myfile.txt"
));
assertEquals
(
"/home/user/.m2/settings/myfile"
,
StringUtils
.
stripFilenameExtension
(
"/home/user/.m2/settings/myfile"
));
assertEquals
(
"/home/user/.m2/settings/myfile"
,
StringUtils
.
stripFilenameExtension
(
"/home/user/.m2/settings/myfile."
));
assertEquals
(
"/home/user/.m2/settings/myfile"
,
StringUtils
.
stripFilenameExtension
(
"/home/user/.m2/settings/myfile.txt"
));
}
public
void
testCleanPath
()
{
...
...
@@ -561,6 +566,16 @@ public class StringUtilsTests extends TestCase {
assertNull
(
"When given an empty Locale string, must return null."
,
locale
);
}
/**
* <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-8637">See SPR-8637</a>.
*/
public
void
testParseLocaleWithMultiSpecialCharactersInVariant
()
throws
Exception
{
final
String
variant
=
"proper-northern"
;
final
String
localeString
=
"en_GB_"
+
variant
;
Locale
locale
=
StringUtils
.
parseLocaleString
(
localeString
);
assertEquals
(
"Multi-valued variant portion of the Locale not extracted correctly."
,
variant
,
locale
.
getVariant
());
}
/**
* <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
*/
...
...
@@ -611,4 +626,17 @@ public class StringUtilsTests extends TestCase {
assertEquals
(
"Multi-valued variant portion of the Locale not extracted correctly."
,
variant
,
locale
.
getVariant
());
}
/**
* <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-7779">See SPR-7779</a>.
*/
public
void
testParseLocaleWithInvalidCharacters
()
{
try
{
StringUtils
.
parseLocaleString
(
"%0D%0AContent-length:30%0D%0A%0D%0A%3Cscript%3Ealert%28123%29%3C/script%3E"
);
fail
(
"Should have thrown IllegalArgumentException"
);
}
catch
(
IllegalArgumentException
ex
)
{
// expected
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录