Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
ed0bfe30
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
ed0bfe30
编写于
9月 25, 2015
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restrict everything excepting the predefined list of entries.
上级
ecab74af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
9 deletion
+27
-9
core/src/main/java/hudson/model/Slave.java
core/src/main/java/hudson/model/Slave.java
+15
-6
test/src/test/java/hudson/model/SlaveTest2.java
test/src/test/java/hudson/model/SlaveTest2.java
+12
-3
未找到文件。
core/src/main/java/hudson/model/Slave.java
浏览文件 @
ed0bfe30
...
@@ -51,8 +51,10 @@ import java.net.MalformedURLException;
...
@@ -51,8 +51,10 @@ import java.net.MalformedURLException;
import
java.net.URL
;
import
java.net.URL
;
import
java.net.URLConnection
;
import
java.net.URLConnection
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.TreeSet
;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletException
;
...
@@ -322,13 +324,14 @@ public abstract class Slave extends Node implements Serializable {
...
@@ -322,13 +324,14 @@ public abstract class Slave extends Node implements Serializable {
public
URL
getURL
()
throws
MalformedURLException
{
public
URL
getURL
()
throws
MalformedURLException
{
String
name
=
fileName
;
String
name
=
fileName
;
if
(
name
.
equals
(
"hudson-cli.jar"
))
name
=
"jenkins-cli.jar"
;
// Prevent the sandbox escaping (SECURITY-195)
// Prevent the access to war contents & prevent the folder escaping (SECURITY-195)
if
(
name
.
equals
(
".."
)
||
name
.
startsWith
(
"../"
)
||
name
.
startsWith
(
"..\\"
)
||
if
(!
ALLOWED_JNLPJARS_FILES
.
contains
(
name
))
{
name
.
replace
(
'\\'
,
'/'
).
contains
(
"/../"
))
{
throw
new
MalformedURLException
(
"The specified file path "
+
fileName
+
" is not allowed due to security reasons"
);
throw
new
MalformedURLException
(
"The specified file path "
+
fileName
+
" contains '..'. "
}
+
"The path is not allowed due to security reasons"
);
if
(
name
.
equals
(
"hudson-cli.jar"
))
{
name
=
"jenkins-cli.jar"
;
}
}
URL
res
=
Jenkins
.
getInstance
().
servletContext
.
getResource
(
"/WEB-INF/"
+
name
);
URL
res
=
Jenkins
.
getInstance
().
servletContext
.
getResource
(
"/WEB-INF/"
+
name
);
...
@@ -505,4 +508,10 @@ public abstract class Slave extends Node implements Serializable {
...
@@ -505,4 +508,10 @@ public abstract class Slave extends Node implements Serializable {
* Determines the workspace root file name for those who really really need the shortest possible path name.
* Determines the workspace root file name for those who really really need the shortest possible path name.
*/
*/
private
static
final
String
WORKSPACE_ROOT
=
System
.
getProperty
(
Slave
.
class
.
getName
()+
".workspaceRoot"
,
"workspace"
);
private
static
final
String
WORKSPACE_ROOT
=
System
.
getProperty
(
Slave
.
class
.
getName
()+
".workspaceRoot"
,
"workspace"
);
/**
* Provides a collection of file names, which are accessible via /jnlpJars link.
*/
private
static
final
Set
<
String
>
ALLOWED_JNLPJARS_FILES
=
new
TreeSet
<
String
>
(
Arrays
.
asList
(
"slave.jar"
,
"remoting.jar"
,
"jenkins-cli.jar"
,
"hudson-cli.jar"
));
}
}
test/src/test/java/hudson/model/SlaveTest2.java
浏览文件 @
ed0bfe30
...
@@ -52,9 +52,19 @@ public class SlaveTest2 {
...
@@ -52,9 +52,19 @@ public class SlaveTest2 {
// Spot-check correct requests
// Spot-check correct requests
assertJnlpJarUrlIsAllowed
(
slave
,
"slave.jar"
);
assertJnlpJarUrlIsAllowed
(
slave
,
"slave.jar"
);
assertJnlpJarUrlIsAllowed
(
slave
,
"remoting.jar"
);
assertJnlpJarUrlIsAllowed
(
slave
,
"jenkins-cli.jar"
);
assertJnlpJarUrlIsAllowed
(
slave
,
"jenkins-cli.jar"
);
assertJnlpJarUrlIsAllowed
(
slave
,
"hudson-cli.jar"
);
// Go to the upper level
// Check that requests to other WEB-INF contents fail
assertJnlpJarUrlFails
(
slave
,
"web.xml"
);
assertJnlpJarUrlFails
(
slave
,
"web.xml"
);
assertJnlpJarUrlFails
(
slave
,
"classes/bundled-plugins.txt"
);
assertJnlpJarUrlFails
(
slave
,
"classes/dependencies.txt"
);
assertJnlpJarUrlFails
(
slave
,
"plugins/ant.hpi"
);
assertJnlpJarUrlFails
(
slave
,
"nonexistentfolder/something.txt"
);
// Try various kinds of folder escaping (SECURITY-195)
assertJnlpJarUrlFails
(
slave
,
"../"
);
assertJnlpJarUrlFails
(
slave
,
"../"
);
assertJnlpJarUrlFails
(
slave
,
".."
);
assertJnlpJarUrlFails
(
slave
,
".."
);
assertJnlpJarUrlFails
(
slave
,
"..\\"
);
assertJnlpJarUrlFails
(
slave
,
"..\\"
);
...
@@ -89,7 +99,6 @@ public class SlaveTest2 {
...
@@ -89,7 +99,6 @@ public class SlaveTest2 {
// Access from a Web client
// Access from a Web client
JenkinsRule
.
WebClient
client
=
rule
.
createWebClient
();
JenkinsRule
.
WebClient
client
=
rule
.
createWebClient
();
client
.
getPage
(
client
.
getContextPath
()
+
"jnlpJars/"
+
URLEncoder
.
encode
(
url
,
"UTF-8"
)).
getWebResponse
().
getContentAsString
();
client
.
getPage
(
client
.
getContextPath
()
+
"jnlpJars/"
+
URLEncoder
.
encode
(
url
,
"UTF-8"
)).
getWebResponse
().
getContentAsString
();
client
.
getPage
(
jnlpJar
.
getURL
()).
getWebResponse
().
getContentAsString
();
client
.
getPage
(
jnlpJar
.
getURL
()).
getWebResponse
().
getContentAsString
();
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录