Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
de473f1e
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,发现更多精彩内容 >>
未验证
提交
de473f1e
编写于
9月 23, 2016
作者:
V
Vincent Latombe
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-38187] Make slaveAgentPort readonly in case the enforce flag is set
上级
e9e2d868
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
3 deletion
+30
-3
core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
...ain/java/hudson/security/GlobalSecurityConfiguration.java
+4
-0
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+11
-1
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
.../hudson/security/GlobalSecurityConfiguration/index.groovy
+12
-2
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.properties
...son/security/GlobalSecurityConfiguration/index.properties
+3
-0
未找到文件。
core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
浏览文件 @
de473f1e
...
...
@@ -72,6 +72,10 @@ public class GlobalSecurityConfiguration extends ManagementLink implements Descr
return
Jenkins
.
getInstance
().
getSlaveAgentPort
();
}
public
boolean
isSlaveAgentPortEnforced
()
{
return
Jenkins
.
getInstance
().
isSlaveAgentPortEnforced
();
}
public
Set
<
String
>
getAgentProtocols
()
{
return
Jenkins
.
getInstance
().
getAgentProtocols
();
}
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
de473f1e
...
...
@@ -1104,11 +1104,21 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
return
slaveAgentPort
;
}
public
boolean
isSlaveAgentPortEnforced
()
{
return
Jenkins
.
SLAVE_AGENT_PORT_ENFORCE
;
}
/**
* @param port
* 0 to indicate random available TCP port. -1 to disable this service.
*/
public
void
setSlaveAgentPort
(
int
port
)
throws
IOException
{
if
(!
SLAVE_AGENT_PORT_ENFORCE
)
{
forceSetSlaveAgentPort
(
port
);
}
}
private
void
forceSetSlaveAgentPort
(
int
port
)
throws
IOException
{
this
.
slaveAgentPort
=
port
;
launchTcpSlaveAgentListener
();
}
...
...
@@ -1240,7 +1250,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
public
void
doAct
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
j
.
s
etSlaveAgentPort
(
getExpectedPort
());
j
.
forceS
etSlaveAgentPort
(
getExpectedPort
());
rsp
.
sendRedirect2
(
req
.
getContextPath
()
+
"/manage"
);
}
...
...
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
浏览文件 @
de473f1e
...
...
@@ -26,8 +26,18 @@ l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName, csscla
set
(
"descriptor"
,
my
.
descriptor
);
f
.
optionalBlock
(
field:
"useSecurity"
,
title:
_
(
"Enable security"
),
checked:
app
.
useSecurity
)
{
f
.
entry
(
title:
_
(
"TCP port for JNLP agents"
),
field:
"slaveAgentPort"
)
{
f
.
serverTcpPort
()
f
.
entry
(
title:
_
(
"TCP port for JNLP agents"
),
field:
"slaveAgentPort"
)
{
if
(
my
.
slaveAgentPortEnforced
)
{
if
(
my
.
slaveAgentPort
==
-
1
)
{
text
(
_
(
"slaveAgentPortEnforcedDisabled"
))
}
else
if
(
my
.
slaveAgentPort
==
0
)
{
text
(
_
(
"slaveAgentPortEnforcedRandom"
))
}
else
{
text
(
_
(
"slaveAgentPortEnforced"
,
my
.
slaveAgentPort
))
}
}
else
{
f
.
serverTcpPort
()
}
}
f
.
advanced
(
title:
_
(
"Agent protocols"
),
align:
"left"
)
{
f
.
entry
(
title:
_
(
"Agent protocols"
))
{
...
...
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.properties
0 → 100644
浏览文件 @
de473f1e
slaveAgentPortEnforced
=
enforced to {0,number,#} on startup through system property.
slaveAgentPortEnforcedRandom
=
enforced to random port on startup through system property.
slaveAgentPortEnforcedDisabled
=
disabled on startup through system property.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录