Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
e54b19d8
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
e54b19d8
编写于
3月 25, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
[JENKINS-27055] Noting merge of #1621.
上级
cfa4b100
20c458d9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
3 deletion
+13
-3
changelog.html
changelog.html
+3
-1
core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
...rc/main/java/jenkins/security/s2m/FilePathRuleConfig.java
+1
-1
test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
...test/java/jenkins/security/DefaultFilePathFilterTest.java
+9
-1
未找到文件。
changelog.html
浏览文件 @
e54b19d8
...
...
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
>
<li
class=
bug
>
Security file pattern whitelist was broken for some plugins since 1.597.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-27055"
>
issue 27055
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
<h3><a
name=
v1.606
>
What's new in 1.606
</a>
(2015/03/23)
</h3>
...
...
core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
浏览文件 @
e54b19d8
...
...
@@ -40,7 +40,7 @@ class FilePathRuleConfig extends ConfigDirectory<FilePathRule,List<FilePathRule>
if
(
line
.
isEmpty
())
return
null
;
line
=
line
.
replace
(
"<BUILDDIR>"
,
"<JOBDIR>/builds/<BUILDID>"
);
line
=
line
.
replace
(
"<BUILDID>"
,
"
[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9]
"
);
line
=
line
.
replace
(
"<BUILDID>"
,
"
(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9]|[0-9]+)
"
);
line
=
line
.
replace
(
"<JOBDIR>"
,
"<JENKINS_HOME>/jobs/.+"
);
line
=
line
.
replace
(
"<JENKINS_HOME>"
,
"\\Q"
+
Jenkins
.
getInstance
().
getRootDir
().
getPath
()+
"\\E"
);
...
...
test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
浏览文件 @
e54b19d8
...
...
@@ -33,7 +33,6 @@ import java.io.StringWriter;
import
jenkins.security.s2m.AdminWhitelistRule
;
import
jenkins.security.s2m.DefaultFilePathFilter
;
import
jenkins.security.s2m.MasterKillSwitchConfiguration
;
import
org.jenkinsci.remoting.RoleChecker
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
@@ -42,6 +41,7 @@ import org.junit.Rule;
import
org.jvnet.hudson.test.JenkinsRule
;
import
javax.inject.Inject
;
import
org.jvnet.hudson.test.Issue
;
public
class
DefaultFilePathFilterTest
{
...
...
@@ -111,4 +111,12 @@ public class DefaultFilePathFilterTest {
throw
new
NoSuchMethodError
();
// simulate legacy Callable impls
}
}
@Issue
(
"JENKINS-27055"
)
@Test
public
void
matchBuildDir
()
throws
Exception
{
File
f
=
new
File
(
r
.
buildAndAssertSuccess
(
r
.
createFreeStyleProject
()).
getRootDir
(),
"whatever"
);
rule
.
setMasterKillSwitch
(
false
);
assertTrue
(
rule
.
checkFileAccess
(
"write"
,
f
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录