Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
8b823110
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,发现更多精彩内容 >>
提交
8b823110
编写于
1月 21, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-16319] Stream ordering problem prevented SecretRewriter from working on Windows.
上级
c2459e78
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
17 deletion
+20
-17
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/util/SecretRewriter.java
core/src/main/java/hudson/util/SecretRewriter.java
+17
-17
未找到文件。
changelog.html
浏览文件 @
8b823110
...
...
@@ -66,6 +66,9 @@ Upcoming changes</a>
Improved logging and error output from SSHD in Jenkins.
<li
class=
rfe
>
Linking to the
<code>
/threadDump
</code>
page from
<code>
/systemInfo
</code>
so it is discoverable.
<li
class=
'major bug'
>
Rekeying operation (from SECURITY-49 fix in 1.498) failed on Windows.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16319"
>
issue 16319
</a>
)
<li
class=
bug
>
Links should preserve used protocol
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16368"
>
issue 16368
</a>
)
...
...
core/src/main/java/hudson/util/SecretRewriter.java
浏览文件 @
8b823110
...
...
@@ -76,15 +76,15 @@ public class SecretRewriter {
* if the rewrite doesn't happen, no copying.
*/
public
boolean
rewrite
(
File
f
,
File
backup
)
throws
InvalidKeyException
,
IOException
{
FileInputStream
fin
=
new
FileInputStream
(
f
);
AtomicFileWriter
w
=
new
AtomicFileWriter
(
f
,
"UTF-8"
);
try
{
BufferedReader
r
=
new
BufferedReader
(
new
InputStreamReader
(
fin
,
"UTF-8"
));
AtomicFileWriter
w
=
new
AtomicFileWriter
(
f
,
"UTF-8"
);
try
{
PrintWriter
out
=
new
PrintWriter
(
new
BufferedWriter
(
w
));
PrintWriter
out
=
new
PrintWriter
(
new
BufferedWriter
(
w
));
boolean
modified
=
false
;
// did we actually change anything?
boolean
modified
=
false
;
// did we actually change anything?
try
{
FileInputStream
fin
=
new
FileInputStream
(
f
);
try
{
BufferedReader
r
=
new
BufferedReader
(
new
InputStreamReader
(
fin
,
"UTF-8"
));
String
line
;
StringBuilder
buf
=
new
StringBuilder
();
...
...
@@ -110,22 +110,22 @@ public class SecretRewriter {
out
.
println
(
buf
.
toString
());
}
}
finally
{
out
.
close
();
fin
.
close
();
}
}
finally
{
out
.
close
();
}
if
(
modified
)
{
if
(
backup
!=
null
)
{
backup
.
getParentFile
().
mkdirs
();
FileUtils
.
copyFile
(
f
,
backup
);
}
w
.
commit
();
if
(
modified
)
{
if
(
backup
!=
null
)
{
backup
.
getParentFile
().
mkdirs
();
FileUtils
.
copyFile
(
f
,
backup
);
}
return
modified
;
}
finally
{
w
.
abort
();
w
.
commit
();
}
return
modified
;
}
finally
{
fin
.
close
();
w
.
abort
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录