Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
ad5b2d12
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,发现更多精彩内容 >>
提交
ad5b2d12
编写于
1月 08, 2016
作者:
D
Daniel Beck
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1949 from csimons/prohibit-rename-node-to-existing
[FIXED JENKINS-31321] protect against node-rename corruption
上级
068c09f2
16d6429c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
4 deletion
+46
-4
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+10
-3
test/src/test/java/hudson/model/ComputerTest.java
test/src/test/java/hudson/model/ComputerTest.java
+36
-1
未找到文件。
core/src/main/java/hudson/model/Computer.java
浏览文件 @
ad5b2d12
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
* The MIT License
* The MIT License
*
*
* Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi,
* Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi,
* Red Hat, Inc., Seiji Sogabe, Stephen Connolly, Thomas J. Black, Tom Huybrechts, CloudBees, Inc.
* Red Hat, Inc., Seiji Sogabe, Stephen Connolly, Thomas J. Black, Tom Huybrechts,
* CloudBees, Inc., Christopher Simons
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* of this software and associated documentation files (the "Software"), to deal
...
@@ -1384,13 +1385,19 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
...
@@ -1384,13 +1385,19 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
public
void
doConfigSubmit
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
,
ServletException
,
FormException
{
public
void
doConfigSubmit
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
,
ServletException
,
FormException
{
checkPermission
(
CONFIGURE
);
checkPermission
(
CONFIGURE
);
String
n
ame
=
Util
.
fixEmptyAndTrim
(
req
.
getSubmittedForm
().
getString
(
"name"
));
String
proposedN
ame
=
Util
.
fixEmptyAndTrim
(
req
.
getSubmittedForm
().
getString
(
"name"
));
Jenkins
.
checkGoodName
(
n
ame
);
Jenkins
.
checkGoodName
(
proposedN
ame
);
Node
node
=
getNode
();
Node
node
=
getNode
();
if
(
node
==
null
)
{
if
(
node
==
null
)
{
throw
new
ServletException
(
"No such node "
+
nodeName
);
throw
new
ServletException
(
"No such node "
+
nodeName
);
}
}
if
((!
proposedName
.
equals
(
nodeName
))
&&
Jenkins
.
getActiveInstance
().
getNode
(
proposedName
)
!=
null
)
{
throw
new
FormException
(
Messages
.
ComputerSet_SlaveAlreadyExists
(
proposedName
),
"name"
);
}
Node
result
=
node
.
reconfigure
(
req
,
req
.
getSubmittedForm
());
Node
result
=
node
.
reconfigure
(
req
,
req
.
getSubmittedForm
());
replaceBy
(
result
);
replaceBy
(
result
);
...
...
test/src/test/java/hudson/model/ComputerTest.java
浏览文件 @
ad5b2d12
/*
/*
* The MIT License
* The MIT License
*
*
* Copyright (c) 2015 Red Hat, Inc.
* Copyright (c) 2015 Red Hat, Inc.
; Christopher Simons
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* of this software and associated documentation files (the "Software"), to deal
...
@@ -23,16 +23,26 @@
...
@@ -23,16 +23,26 @@
*/
*/
package
hudson.model
;
package
hudson.model
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.*;
import
com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException
;
import
com.gargoylesoftware.htmlunit.html.HtmlForm
;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
import
java.io.File
;
import
java.io.File
;
import
jenkins.model.Jenkins
;
import
jenkins.model.Jenkins
;
import
hudson.slaves.DumbSlave
;
import
hudson.slaves.DumbSlave
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.JenkinsRule.WebClient
;
public
class
ComputerTest
{
public
class
ComputerTest
{
...
@@ -52,4 +62,29 @@ public class ComputerTest {
...
@@ -52,4 +62,29 @@ public class ComputerTest {
assertTrue
(
"Slave log should be kept"
,
keep
.
toComputer
().
getLogFile
().
exists
());
assertTrue
(
"Slave log should be kept"
,
keep
.
toComputer
().
getLogFile
().
exists
());
}
}
/**
* Verify we can't rename a node over an existing node.
*/
@Issue
(
"JENKINS-31321"
)
@Test
public
void
testProhibitRenameOverExistingNode
()
throws
Exception
{
final
String
NOTE
=
"Rename node to name of another node should fail."
;
Node
nodeA
=
j
.
createSlave
(
"nodeA"
,
null
,
null
);
Node
nodeB
=
j
.
createSlave
(
"nodeB"
,
null
,
null
);
WebClient
wc
=
j
.
createWebClient
();
HtmlForm
form
=
wc
.
getPage
(
nodeB
,
"configure"
).
getFormByName
(
"config"
);
form
.
getInputByName
(
"_.name"
).
setValueAttribute
(
"nodeA"
);
try
{
j
.
submit
(
form
);
fail
(
NOTE
);
}
catch
(
FailingHttpStatusCodeException
e
)
{
assertThat
(
NOTE
,
e
.
getStatusCode
(),
equalTo
(
400
));
assertThat
(
NOTE
,
e
.
getResponse
().
getContentAsString
(),
containsString
(
"Slave called ‘nodeA’ already exists"
));
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录