Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
jenkins
提交
1ce52273
J
jenkins
项目概览
野花太放肆
/
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,发现更多精彩内容 >>
提交
1ce52273
编写于
7月 16, 2013
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'pull-850'
上级
afeed97c
7bf67b6d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
10 deletion
+27
-10
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+20
-0
core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
.../java/hudson/security/HudsonAuthenticationEntryPoint.java
+6
-0
core/src/main/resources/lib/layout/layout.jelly
core/src/main/resources/lib/layout/layout.jelly
+1
-10
未找到文件。
core/src/main/java/hudson/Functions.java
浏览文件 @
1ce52273
...
@@ -1765,4 +1765,24 @@ public class Functions {
...
@@ -1765,4 +1765,24 @@ public class Functions {
.
replaceAll
(
"(\\w{10})(?=\\w{3})"
,
"$1<wbr>"
)
.
replaceAll
(
"(\\w{10})(?=\\w{3})"
,
"$1<wbr>"
)
;
;
}
}
/**
* Advertises the minimum set of HTTP headers that assist programmatic
* discovery of Jenkins.
*/
public
static
void
advertiseHeaders
(
HttpServletResponse
rsp
)
{
Jenkins
j
=
Jenkins
.
getInstance
();
rsp
.
setHeader
(
"X-Hudson"
,
"1.395"
);
rsp
.
setHeader
(
"X-Jenkins"
,
Jenkins
.
VERSION
);
rsp
.
setHeader
(
"X-Jenkins-Session"
,
Jenkins
.
SESSION_HASH
);
TcpSlaveAgentListener
tal
=
j
.
tcpSlaveAgentListener
;
if
(
tal
!=
null
)
{
rsp
.
setIntHeader
(
"X-Hudson-CLI-Port"
,
tal
.
getPort
());
rsp
.
setIntHeader
(
"X-Jenkins-CLI-Port"
,
tal
.
getPort
());
rsp
.
setIntHeader
(
"X-Jenkins-CLI2-Port"
,
tal
.
getPort
());
rsp
.
setHeader
(
"X-Jenkins-CLI-Host"
,
TcpSlaveAgentListener
.
CLI_HOST_NAME
);
}
}
}
}
core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
浏览文件 @
1ce52273
...
@@ -23,6 +23,10 @@
...
@@ -23,6 +23,10 @@
*/
*/
package
hudson.security
;
package
hudson.security
;
import
hudson.Functions
;
import
jenkins.model.Jenkins
;
import
hudson.TcpSlaveAgentListener
;
import
com.google.common.base.Strings
;
import
com.google.common.base.Strings
;
import
org.acegisecurity.AuthenticationException
;
import
org.acegisecurity.AuthenticationException
;
import
org.acegisecurity.InsufficientAuthenticationException
;
import
org.acegisecurity.InsufficientAuthenticationException
;
...
@@ -81,6 +85,8 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt
...
@@ -81,6 +85,8 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt
rsp
.
setStatus
(
SC_FORBIDDEN
);
rsp
.
setStatus
(
SC_FORBIDDEN
);
rsp
.
setContentType
(
"text/html;charset=UTF-8"
);
rsp
.
setContentType
(
"text/html;charset=UTF-8"
);
Functions
.
advertiseHeaders
(
rsp
);
AccessDeniedException2
cause
=
null
;
AccessDeniedException2
cause
=
null
;
// report the diagnosis information if possible
// report the diagnosis information if possible
if
(
reason
instanceof
InsufficientAuthenticationException
)
{
if
(
reason
instanceof
InsufficientAuthenticationException
)
{
...
...
core/src/main/resources/lib/layout/layout.jelly
浏览文件 @
1ce52273
...
@@ -71,16 +71,7 @@ ${h.initPageVariables(context)}
...
@@ -71,16 +71,7 @@ ${h.initPageVariables(context)}
<j:set
var=
"_"
value=
"${h.configureAutoRefresh(request, response, attrs.norefresh!=null)}"
/>
<j:set
var=
"_"
value=
"${h.configureAutoRefresh(request, response, attrs.norefresh!=null)}"
/>
<j:if
test=
"${request.servletPath=='/' || request.servletPath==''}"
>
<j:if
test=
"${request.servletPath=='/' || request.servletPath==''}"
>
<st:setHeader
name=
"X-Hudson"
value=
"1.395"
/>
${h.advertiseHeaders(response)}
<st:setHeader
name=
"X-Jenkins"
value=
"${servletContext.getAttribute('version')}"
/>
<st:setHeader
name=
"X-Jenkins-Session"
value=
"${app.SESSION_HASH}"
/>
<j:if
test=
"${app.tcpSlaveAgentListener!=null}"
>
<!-- advertise the CLI TCP port -->
<st:setHeader
name=
"X-Hudson-CLI-Port"
value=
"${app.tcpSlaveAgentListener.port}"
/>
<st:setHeader
name=
"X-Jenkins-CLI-Port"
value=
"${app.tcpSlaveAgentListener.port}"
/>
<st:setHeader
name=
"X-Jenkins-CLI2-Port"
value=
"${app.tcpSlaveAgentListener.port}"
/>
<st:setHeader
name=
"X-Jenkins-CLI-Host"
value=
"${app.tcpSlaveAgentListener.CLI_HOST_NAME}"
/>
</j:if>
<j:forEach
var=
"pd"
items=
"${h.pageDecorators}"
>
<j:forEach
var=
"pd"
items=
"${h.pageDecorators}"
>
<st:include
it=
"${pd}"
page=
"httpHeaders.jelly"
optional=
"true"
/>
<st:include
it=
"${pd}"
page=
"httpHeaders.jelly"
optional=
"true"
/>
</j:forEach>
</j:forEach>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录