Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
d03e68f0
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d03e68f0
编写于
5月 12, 2016
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-34755] - Wrap SecurityExceptions, they should not go outside
上级
bea2a923
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
31 deletion
+41
-31
core/src/main/java/jenkins/util/SystemProperties.java
core/src/main/java/jenkins/util/SystemProperties.java
+41
-31
未找到文件。
core/src/main/java/jenkins/util/SystemProperties.java
浏览文件 @
d03e68f0
...
...
@@ -28,6 +28,7 @@ import hudson.EnvVars;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
javax.servlet.ServletContext
;
import
org.apache.commons.lang.StringUtils
;
/**
* Centralizes calls to {@link System#getProperty()} and related calls.
...
...
@@ -82,9 +83,6 @@ public class SystemProperties {
* @return the string value of the system property,
* or {@code null} if there is no property with that key.
*
* @exception SecurityException if a security manager exists and its
* {@link SecurityManager#checkPropertyAccess(java.lang.String)} method doesn't allow
* accessing to the specified system property.
* @exception NullPointerException if {@code key} is {@code null}.
* @exception IllegalArgumentException if {@code key} is empty.
*/
...
...
@@ -94,20 +92,20 @@ public class SystemProperties {
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
}
else
if
(
theContext
!=
null
)
{
value
=
theContext
.
getInitParameter
(
key
);
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (context): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
}
}
else
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (not found): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
return
value
;
}
}
return
value
;
value
=
tryGetValueFromContext
(
key
);
if
(
value
!=
null
)
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (context): {0} => {1}"
,
new
Object
[]{
key
,
value
});
return
value
;
}
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (not found): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
return
null
;
}
/**
...
...
@@ -120,9 +118,6 @@ public class SystemProperties {
* @return the string value of the system property,
* or {@code null} if there is no property with that key.
*
* @exception SecurityException if a security manager exists and its
* {@link SecurityManager#checkPropertyAccess(java.lang.String)} method doesn't allow
* access to the specified system property.
* @exception NullPointerException if {@code key} is {@code null}.
* @exception IllegalArgumentException if {@code key} is empty.
*/
...
...
@@ -132,22 +127,21 @@ public class SystemProperties {
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
return
value
;
}
}
else
if
(
theContext
!=
null
)
{
value
=
theContext
.
getInitParameter
(
key
);
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (context): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
}
}
value
=
tryGetValueFromContext
(
key
);
if
(
value
!=
null
)
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (context): {0} => {1}"
,
new
Object
[]{
key
,
value
});
return
value
;
}
if
(
value
==
null
)
{
value
=
def
;
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (default): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
value
=
def
;
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (default): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
}
return
value
;
return
value
;
}
/**
...
...
@@ -240,4 +234,20 @@ public class SystemProperties {
public
static
void
initialize
(
ServletContext
context
)
{
theContext
=
context
;
}
@CheckForNull
private
static
String
tryGetValueFromContext
(
String
key
)
{
if
(
StringUtils
.
isNotBlank
(
key
)
&&
theContext
!=
null
)
{
try
{
String
value
=
theContext
.
getInitParameter
(
key
);
if
(
value
!=
null
)
{
return
value
;
}
}
catch
(
SecurityException
ex
)
{
// Log exception and go on
LOGGER
.
log
(
Level
.
CONFIG
,
"Access to the property {0} is prohibited"
,
key
);
}
}
return
null
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录