Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
roginluo
Jenkins
提交
aa8b855a
J
Jenkins
项目概览
roginluo
/
Jenkins
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
Jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa8b855a
编写于
2月 04, 2016
作者:
D
Daniel Beck
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[SECURITY-247] Added doCreateItem test, improved loading test
上级
18cc8e0e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
85 addition
and
8 deletion
+85
-8
test/src/test/java/hudson/util/XStream2Security247Test.java
test/src/test/java/hudson/util/XStream2Security247Test.java
+84
-7
test/src/test/resources/hudson/util/XStream2Security247Test/config.xml
.../resources/hudson/util/XStream2Security247Test/config.xml
+1
-1
未找到文件。
test/src/test/java/hudson/util/XStream2Security247Test.java
浏览文件 @
aa8b855a
package
hudson.util
;
import
hudson.Functions
;
import
hudson.model.Items
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.*
;
import
org.apache.commons.io.IOUtils
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.rules.TemporaryFolder
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
import
org.mockito.Mock
;
import
org.mockito.MockitoAnnotations
;
import
javax.servlet.ServletInputStream
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
mockito
.
Mockito
.
when
;
public
class
XStream2Security247Test
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
@Rule
public
TemporaryFolder
f
=
new
TemporaryFolder
();
@Mock
private
StaplerRequest
req
;
@Mock
private
StaplerResponse
rsp
;
@Before
public
void
setUp
()
throws
Exception
{
MockitoAnnotations
.
initMocks
(
this
);
}
@Test
@Issue
(
"SECURITY-247"
)
public
void
dontUnmarshalMethodClosure
()
throws
Exception
{
if
(
Functions
.
isWindows
())
return
;
File
exploitFile
=
new
File
(
"/tmp/jenkins-security247test"
);
public
void
testXmlLoad
()
throws
Exception
{
File
exploitFile
=
f
.
newFile
();
try
{
// be extra sure there's no file already
if
(
exploitFile
.
exists
()
&&
!
exploitFile
.
delete
())
{
throw
new
IllegalStateException
(
"file exists and cannot be deleted"
);
}
File
tempJobDir
=
new
File
(
j
.
jenkins
.
getRootDir
(),
"security247"
);
FileUtils
.
copyInputStreamToFile
(
XStream2Security247Test
.
class
.
getResourceAsStream
(
"/hudson/util/XStream2Security247Test/config.xml"
),
new
File
(
tempJobDir
,
"config.xml"
));
String
exploitXml
=
org
.
apache
.
commons
.
io
.
IOUtils
.
toString
(
XStream2Security247Test
.
class
.
getResourceAsStream
(
"/hudson/util/XStream2Security247Test/config.xml"
),
"UTF-8"
);
exploitXml
=
exploitXml
.
replace
(
"@TOKEN@"
,
exploitFile
.
getAbsolutePath
());
FileUtils
.
write
(
new
File
(
tempJobDir
,
"config.xml"
),
exploitXml
);
try
{
Items
.
load
(
j
.
jenkins
,
tempJobDir
);
}
catch
(
Exception
e
)
{
...
...
@@ -40,4 +70,51 @@ public class XStream2Security247Test {
exploitFile
.
delete
();
}
}
@Test
@Issue
(
"SECURITY-247"
)
public
void
testPostJobXml
()
throws
Exception
{
File
exploitFile
=
f
.
newFile
();
try
{
// be extra sure there's no file already
if
(
exploitFile
.
exists
()
&&
!
exploitFile
.
delete
())
{
throw
new
IllegalStateException
(
"file exists and cannot be deleted"
);
}
File
tempJobDir
=
new
File
(
j
.
jenkins
.
getRootDir
(),
"security247"
);
String
exploitXml
=
org
.
apache
.
commons
.
io
.
IOUtils
.
toString
(
XStream2Security247Test
.
class
.
getResourceAsStream
(
"/hudson/util/XStream2Security247Test/config.xml"
),
"UTF-8"
);
exploitXml
=
exploitXml
.
replace
(
"@TOKEN@"
,
exploitFile
.
getAbsolutePath
());
when
(
req
.
getMethod
()).
thenReturn
(
"POST"
);
when
(
req
.
getInputStream
()).
thenReturn
(
new
Stream
(
IOUtils
.
toInputStream
(
exploitXml
)));
when
(
req
.
getContentType
()).
thenReturn
(
"application/xml"
);
when
(
req
.
getParameter
(
"name"
)).
thenReturn
(
"foo"
);
try
{
j
.
jenkins
.
doCreateItem
(
req
,
rsp
);
}
catch
(
Exception
e
)
{
// don't care
}
assertFalse
(
"no file should be created here"
,
exploitFile
.
exists
());
}
finally
{
exploitFile
.
delete
();
}
}
private
static
class
Stream
extends
ServletInputStream
{
private
final
InputStream
inner
;
public
Stream
(
final
InputStream
inner
)
{
this
.
inner
=
inner
;
}
@Override
public
int
read
()
throws
IOException
{
return
inner
.
read
();
}
}
}
test/src/test/resources/hudson/util/XStream2Security247Test/config.xml
浏览文件 @
aa8b855a
...
...
@@ -9,7 +9,7 @@
<owner
class=
"java.lang.ProcessBuilder"
>
<command>
<string>
touch
</string>
<string>
/tmp/jenkins-security247test
</string>
<string>
@TOKEN@
</string>
</command>
<redirectErrorStream>
false
</redirectErrorStream>
</owner>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录