Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
4bbdf819
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,发现更多精彩内容 >>
提交
4bbdf819
编写于
8月 01, 2017
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extending fix to User.
上级
29a9ad76
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
71 addition
and
1 deletion
+71
-1
core/src/main/java/hudson/model/User.java
core/src/main/java/hudson/model/User.java
+35
-1
test/src/test/java/hudson/model/UserRestartTest.java
test/src/test/java/hudson/model/UserRestartTest.java
+36
-0
未找到文件。
core/src/main/java/hudson/model/User.java
浏览文件 @
4bbdf819
...
...
@@ -50,6 +50,7 @@ import hudson.util.XStream2;
import
java.io.File
;
import
java.io.FileFilter
;
import
java.io.IOException
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collection
;
...
...
@@ -731,10 +732,43 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
throw
FormValidation
.
error
(
Messages
.
User_IllegalFullname
(
fullName
));
}
if
(
BulkChange
.
contains
(
this
))
return
;
getConfigFile
().
write
(
this
);
synchronized
(
saving
)
{
saving
.
add
(
this
);
}
try
{
getConfigFile
().
write
(
this
);
}
finally
{
synchronized
(
saving
)
{
saving
.
remove
(
this
);
}
}
SaveableListener
.
fireOnChange
(
this
,
getConfigFile
());
}
private
static
final
Set
<
User
>
saving
=
new
HashSet
<>();
private
Object
writeReplace
()
{
synchronized
(
saving
)
{
if
(
saving
.
contains
(
this
))
{
return
this
;
}
else
{
LOGGER
.
log
(
Level
.
WARNING
,
"JENKINS-45892: reference to {0} being saved but not at top level"
,
this
);
return
new
Replacer
(
this
);
}
}
}
/** Not {@link Serializable} for now, since we are only expecting to use this from XStream. */
private
static
class
Replacer
{
private
final
String
id
;
Replacer
(
User
u
)
{
id
=
u
.
getId
();
}
private
Object
readResolve
()
{
return
getById
(
id
,
false
);
}
}
/**
* Deletes the data directory and removes this user from Hudson.
*
...
...
test/src/test/java/hudson/model/UserRestartTest.java
浏览文件 @
4bbdf819
...
...
@@ -25,10 +25,13 @@
package
hudson.model
;
import
hudson.tasks.Mailer
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Rule
;
import
org.junit.runners.model.Statement
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.RestartableJenkinsRule
;
public
class
UserRestartTest
{
...
...
@@ -58,4 +61,37 @@ public class UserRestartTest {
});
}
@Issue
(
"JENKINS-45892"
)
@Test
public
void
badSerialization
()
{
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
rr
.
j
.
jenkins
.
setSecurityRealm
(
rr
.
j
.
createDummySecurityRealm
());
FreeStyleProject
p
=
rr
.
j
.
createFreeStyleProject
(
"p"
);
User
u
=
User
.
get
(
"pqhacker"
);
u
.
setFullName
(
"Pat Q. Hacker"
);
u
.
save
();
p
.
addProperty
(
new
BadProperty
(
u
));
String
text
=
p
.
getConfigFile
().
asString
();
System
.
out
.
println
(
text
);
assertThat
(
text
,
not
(
containsString
(
"<fullName>Pat Q. Hacker</fullName>"
)));
}
});
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
FreeStyleProject
p
=
rr
.
j
.
jenkins
.
getItemByFullName
(
"p"
,
FreeStyleProject
.
class
);
User
u
=
p
.
getProperty
(
BadProperty
.
class
).
user
;
// do not inline: call User.get second
assertEquals
(
User
.
get
(
"pqhacker"
),
u
);
}
});
}
static
class
BadProperty
extends
JobProperty
<
FreeStyleProject
>
{
final
User
user
;
BadProperty
(
User
user
)
{
this
.
user
=
user
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录