Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
82b42359
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,发现更多精彩内容 >>
提交
82b42359
编写于
4月 19, 2016
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[SECURITY-266] Conceal ciphertext from the web UI for a user who has no Item.CONFIGURE permission.
上级
d6bcfdac
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
100 addition
and
1 deletion
+100
-1
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+10
-1
test/src/test/java/lib/form/PasswordTest.java
test/src/test/java/lib/form/PasswordTest.java
+59
-0
test/src/test/resources/lib/form/PasswordTest/VulnerableProperty/config.jelly
...ces/lib/form/PasswordTest/VulnerableProperty/config.jelly
+31
-0
未找到文件。
core/src/main/java/hudson/Functions.java
浏览文件 @
82b42359
...
...
@@ -1715,7 +1715,16 @@ public class Functions {
*/
public
String
getPasswordValue
(
Object
o
)
{
if
(
o
==
null
)
return
null
;
if
(
o
instanceof
Secret
)
return
((
Secret
)
o
).
getEncryptedValue
();
if
(
o
instanceof
Secret
)
{
StaplerRequest
req
=
Stapler
.
getCurrentRequest
();
if
(
req
!=
null
)
{
Item
item
=
req
.
findAncestorObject
(
Item
.
class
);
if
(
item
!=
null
&&
!
item
.
hasPermission
(
Item
.
CONFIGURE
))
{
return
"<some secret>"
;
}
}
return
((
Secret
)
o
).
getEncryptedValue
();
}
if
(
getIsUnitTest
())
{
throw
new
SecurityException
(
"attempted to render plaintext ‘"
+
o
+
"’ in password field; use a getter of type Secret instead"
);
}
...
...
test/src/test/java/lib/form/PasswordTest.java
浏览文件 @
82b42359
...
...
@@ -28,8 +28,20 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
import
hudson.Extension
;
import
hudson.model.Describable
;
import
hudson.model.Descriptor
;
import
hudson.model.FreeStyleProject
;
import
hudson.model.Item
;
import
hudson.model.JobProperty
;
import
hudson.model.JobPropertyDescriptor
;
import
hudson.security.GlobalMatrixAuthorizationStrategy
;
import
hudson.util.Secret
;
import
jenkins.model.Jenkins
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
org.jvnet.hudson.test.HudsonTestCase
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.TestExtension
;
import
org.kohsuke.stapler.DataBoundConstructor
;
/**
* @author Kohsuke Kawaguchi
...
...
@@ -55,4 +67,51 @@ public class PasswordTest extends HudsonTestCase implements Describable<Password
return
null
;
}
}
@Issue
(
"SECURITY-266"
)
public
void
testExposedCiphertext
()
throws
Exception
{
boolean
saveEnabled
=
Item
.
EXTENDED_READ
.
getEnabled
();
try
{
jenkins
.
setSecurityRealm
(
createDummySecurityRealm
());
// TODO 1.645+ use MockAuthorizationStrategy
GlobalMatrixAuthorizationStrategy
pmas
=
new
GlobalMatrixAuthorizationStrategy
();
pmas
.
add
(
Jenkins
.
ADMINISTER
,
"admin"
);
pmas
.
add
(
Jenkins
.
READ
,
"dev"
);
pmas
.
add
(
Item
.
READ
,
"dev"
);
Item
.
EXTENDED_READ
.
setEnabled
(
true
);
pmas
.
add
(
Item
.
EXTENDED_READ
,
"dev"
);
jenkins
.
setAuthorizationStrategy
(
pmas
);
Secret
secret
=
Secret
.
fromString
(
"s3cr3t"
);
FreeStyleProject
p
=
createFreeStyleProject
(
"p"
);
p
.
addProperty
(
new
VulnerableProperty
(
secret
));
WebClient
wc
=
createWebClient
();
wc
.
login
(
"admin"
);
HtmlPage
configure
=
wc
.
getPage
(
p
,
"configure"
);
assertThat
(
configure
.
getWebResponse
().
getContentAsString
(),
containsString
(
secret
.
getEncryptedValue
()));
submit
(
configure
.
getFormByName
(
"config"
));
VulnerableProperty
vp
=
p
.
getProperty
(
VulnerableProperty
.
class
);
assertNotNull
(
vp
);
assertEquals
(
secret
,
vp
.
secret
);
wc
.
login
(
"dev"
);
configure
=
wc
.
getPage
(
p
,
"configure"
);
assertThat
(
configure
.
getWebResponse
().
getContentAsString
(),
not
(
containsString
(
secret
.
getEncryptedValue
())));
}
finally
{
Item
.
EXTENDED_READ
.
setEnabled
(
saveEnabled
);
}
}
public
static
class
VulnerableProperty
extends
JobProperty
<
FreeStyleProject
>
{
public
final
Secret
secret
;
@DataBoundConstructor
public
VulnerableProperty
(
Secret
secret
)
{
this
.
secret
=
secret
;
}
@TestExtension
(
"testExposedCiphertext"
)
public
static
class
DescriptorImpl
extends
JobPropertyDescriptor
{
@Override
// TODO delete in 1.635+
public
String
getDisplayName
()
{
return
"VulnerableProperty"
;
}
}
}
}
test/src/test/resources/lib/form/PasswordTest/VulnerableProperty/config.jelly
0 → 100644
浏览文件 @
82b42359
<?xml version="1.0" encoding="UTF-8"?>
<!--
The MIT License
Copyright 2016 CloudBees, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly
xmlns:j=
"jelly:core"
xmlns:f=
"/lib/form"
>
<f:entry
field=
"secret"
title=
"secret"
>
<f:password/>
</f:entry>
</j:jelly>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录