Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
c267d498
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,发现更多精彩内容 >>
提交
c267d498
编写于
4月 29, 2011
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
差异文件
merge JENKINS-9521
上级
92606d7c
7b15c23a
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
17 addition
and
6 deletion
+17
-6
changelog.html
changelog.html
+3
-0
cli/pom.xml
cli/pom.xml
+5
-0
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
+2
-2
remoting/pom.xml
remoting/pom.xml
+1
-2
remoting/src/main/java/hudson/remoting/Engine.java
remoting/src/main/java/hudson/remoting/Engine.java
+3
-1
remoting/src/main/java/hudson/remoting/Launcher.java
remoting/src/main/java/hudson/remoting/Launcher.java
+3
-1
未找到文件。
changelog.html
浏览文件 @
c267d498
...
...
@@ -73,6 +73,9 @@ Upcoming changes</a>
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9248"
>
issue 9248
</a>
)
<li
class=
rfe
>
Link to the console output from the status icon of an entry in the HistoryWidget.
<li
class=
rfe
>
Exploit commons-codec for Base64 encoding rather than proprietary sun.misc.BASE64Encoder
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9521"
>
issue 9521
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
cli/pom.xml
浏览文件 @
c267d498
...
...
@@ -50,6 +50,11 @@
</build>
<dependencies>
<dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
1.4
</version>
</dependency>
<dependency>
<groupId>
${project.groupId}
</groupId>
<artifactId>
remoting
</artifactId>
...
...
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
浏览文件 @
c267d498
...
...
@@ -11,7 +11,7 @@ import java.util.UUID;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
sun.misc.BASE64Encoder
;
import
org.apache.commons.codec.binary.Base64
;
/**
* Creates a capacity-unlimited bi-directional {@link InputStream}/{@link OutputStream} pair over
...
...
@@ -38,7 +38,7 @@ public class FullDuplexHttpStream {
String
authorization
=
null
;
if
(
target
.
getUserInfo
()
!=
null
)
{
authorization
=
new
BASE64Encoder
().
encode
(
target
.
getUserInfo
().
getBytes
(
));
authorization
=
new
String
(
new
Base64
().
encodeBase64
(
target
.
getUserInfo
().
getBytes
()
));
}
CrumbData
crumbData
=
new
CrumbData
();
...
...
remoting/pom.xml
浏览文件 @
c267d498
...
...
@@ -162,8 +162,7 @@ THE SOFTWARE.
<dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
1.3
</version>
<scope>
test
</scope>
<version>
1.4
</version>
</dependency>
<dependency>
<groupId>
commons-io
</groupId>
...
...
remoting/src/main/java/hudson/remoting/Engine.java
浏览文件 @
c267d498
...
...
@@ -40,6 +40,8 @@ import java.util.List;
import
java.util.Collections
;
import
java.util.logging.Logger
;
import
org.apache.commons.codec.binary.Base64
;
/**
* Slave agent engine that proactively connects to Hudson master.
*
...
...
@@ -148,7 +150,7 @@ public class Engine extends Thread {
// find out the TCP port
HttpURLConnection
con
=
(
HttpURLConnection
)
salURL
.
openConnection
();
if
(
con
instanceof
HttpURLConnection
&&
credentials
!=
null
)
{
String
encoding
=
new
sun
.
misc
.
BASE64Encoder
().
encode
(
credentials
.
getBytes
(
));
String
encoding
=
new
String
(
new
Base64
().
encodeBase64
(
credentials
.
getBytes
()
));
con
.
setRequestProperty
(
"Authorization"
,
"Basic "
+
encoding
);
}
try
{
...
...
remoting/src/main/java/hudson/remoting/Launcher.java
浏览文件 @
c267d498
...
...
@@ -71,6 +71,8 @@ import java.security.KeyManagementException;
import
java.security.SecureRandom
;
import
java.util.Properties
;
import
org.apache.commons.codec.binary.Base64
;
/**
* Entry point for running a {@link Channel}. This is the main method of the slave JVM.
*
...
...
@@ -216,7 +218,7 @@ public class Launcher {
if
(
con
instanceof
HttpURLConnection
&&
slaveJnlpCredentials
!=
null
)
{
HttpURLConnection
http
=
(
HttpURLConnection
)
con
;
String
userPassword
=
slaveJnlpCredentials
;
String
encoding
=
new
sun
.
misc
.
BASE64Encoder
().
encode
(
userPassword
.
getBytes
(
));
String
encoding
=
new
String
(
new
Base64
().
encodeBase64
(
userPassword
.
getBytes
()
));
http
.
setRequestProperty
(
"Authorization"
,
"Basic "
+
encoding
);
}
con
.
connect
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录