Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
dd75293f
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,发现更多精彩内容 >>
提交
dd75293f
编写于
1月 17, 2012
作者:
H
Hayato ITO
提交者:
Seiji Sogabe
2月 13, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix no proxy host config behavior
上级
ef1ad6ca
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
54 addition
and
2 deletion
+54
-2
core/src/main/java/hudson/ProxyConfiguration.java
core/src/main/java/hudson/ProxyConfiguration.java
+13
-2
core/src/test/java/hudson/ProxyConfigurationTest.java
core/src/test/java/hudson/ProxyConfigurationTest.java
+41
-0
未找到文件。
core/src/main/java/hudson/ProxyConfiguration.java
浏览文件 @
dd75293f
...
...
@@ -129,12 +129,19 @@ public final class ProxyConfiguration extends AbstractDescribableImpl<ProxyConfi
* Returns the list of properly formatted no proxy host names.
*/
public
List
<
Pattern
>
getNoProxyHostPatterns
()
{
return
getNoProxyHostPatterns
(
noProxyHost
);
}
/**
* Returns the list of properly formatted no proxy host names.
*/
public
static
List
<
Pattern
>
getNoProxyHostPatterns
(
String
noProxyHost
)
{
if
(
noProxyHost
==
null
)
return
Collections
.
emptyList
();
List
<
Pattern
>
r
=
Lists
.
newArrayList
();
for
(
String
s
:
noProxyHost
.
split
(
"[ \t\n,|]+"
))
{
if
(
s
.
length
()==
0
)
continue
;
r
.
add
(
Pattern
.
compile
(
s
.
replace
(
"."
,
"\\."
).
replace
(
"*"
,
"
[^.]
*"
)));
r
.
add
(
Pattern
.
compile
(
s
.
replace
(
"."
,
"\\."
).
replace
(
"*"
,
"
.
*"
)));
}
return
r
;
}
...
...
@@ -148,8 +155,12 @@ public final class ProxyConfiguration extends AbstractDescribableImpl<ProxyConfi
}
public
Proxy
createProxy
(
String
host
)
{
return
createProxy
(
host
,
name
,
port
,
noProxyHost
);
}
public
static
Proxy
createProxy
(
String
host
,
String
name
,
int
port
,
String
noProxyHost
)
{
if
(
host
!=
null
&&
noProxyHost
!=
null
)
{
for
(
Pattern
p
:
getNoProxyHostPatterns
())
{
for
(
Pattern
p
:
getNoProxyHostPatterns
(
noProxyHost
))
{
if
(
p
.
matcher
(
host
).
matches
())
return
Proxy
.
NO_PROXY
;
}
...
...
core/src/test/java/hudson/ProxyConfigurationTest.java
0 → 100755
浏览文件 @
dd75293f
/*
* The MIT License
*
* Copyright (c) 2012, Hayato ITO
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson
;
import
junit.framework.TestCase
;
import
java.net.Proxy
;
public
class
ProxyConfigurationTest
extends
TestCase
{
public
void
testNoProxyHost
()
{
String
noProxyHost
=
"*.example.com|192.168.*"
;
assertEquals
(
Proxy
.
Type
.
HTTP
,
ProxyConfiguration
.
createProxy
(
"test.example.co.jp"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
assertEquals
(
Proxy
.
Type
.
DIRECT
,
ProxyConfiguration
.
createProxy
(
"test.example.com"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
assertEquals
(
Proxy
.
Type
.
HTTP
,
ProxyConfiguration
.
createProxy
(
"test.example.com.test.example.co.jp"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
assertEquals
(
Proxy
.
Type
.
DIRECT
,
ProxyConfiguration
.
createProxy
(
"test.test.example.com"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
assertEquals
(
Proxy
.
Type
.
DIRECT
,
ProxyConfiguration
.
createProxy
(
"192.168.10.10"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
assertEquals
(
Proxy
.
Type
.
HTTP
,
ProxyConfiguration
.
createProxy
(
"192.169.10.10"
,
"proxy.example.com"
,
8080
,
noProxyHost
).
type
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录