Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
d6eb3cfb
J
jenkins
项目概览
FIY695
/
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,发现更多精彩内容 >>
提交
d6eb3cfb
编写于
1月 26, 2012
作者:
V
Vojtech Juranek
提交者:
Kohsuke Kawaguchi
1月 27, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added support for ecnrypted key files
上级
79324466
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
50 addition
and
6 deletion
+50
-6
cli/src/main/java/hudson/cli/CLI.java
cli/src/main/java/hudson/cli/CLI.java
+50
-6
未找到文件。
cli/src/main/java/hudson/cli/CLI.java
浏览文件 @
d6eb3cfb
...
...
@@ -69,6 +69,7 @@ import java.util.concurrent.ExecutorService;
import
java.util.concurrent.Executors
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
java.io.Console
;
import
static
java
.
util
.
logging
.
Level
.*;
...
...
@@ -349,13 +350,17 @@ public class CLI {
printUsage
(
Messages
.
CLI_NoSuchFileExists
(
f
));
return
-
1
;
}
KeyPair
kp
=
null
;
try
{
candidateKeys
.
add
(
loadKey
(
f
)
);
kp
=
loadKey
(
f
);
}
catch
(
IOException
e
)
{
throw
new
Exception
(
"Failed to load key: "
+
f
,
e
);
//if the PEM file is encrypted, IOException is thrown
kp
=
tryEncryptedFile
(
f
);
}
catch
(
GeneralSecurityException
e
)
{
throw
new
Exception
(
"Failed to load key: "
+
f
,
e
);
}
if
(
kp
!=
null
)
candidateKeys
.
add
(
kp
);
args
=
args
.
subList
(
2
,
args
.
size
());
sshAuthRequestedExplicitly
=
true
;
continue
;
...
...
@@ -430,19 +435,27 @@ public class CLI {
/**
* Loads RSA/DSA private key in a PEM format into {@link KeyPair}.
*/
public
static
KeyPair
loadKey
(
File
f
,
String
passwd
)
throws
IOException
,
GeneralSecurityException
{
return
loadKey
(
readPemFile
(
f
),
passwd
);
}
public
static
KeyPair
loadKey
(
File
f
)
throws
IOException
,
GeneralSecurityException
{
return
loadKey
(
f
,
null
);
}
private
static
String
readPemFile
(
File
f
)
throws
IOException
{
DataInputStream
dis
=
new
DataInputStream
(
new
FileInputStream
(
f
));
byte
[]
bytes
=
new
byte
[(
int
)
f
.
length
()];
dis
.
readFully
(
bytes
);
dis
.
close
();
return
loadKey
(
new
String
(
bytes
)
);
return
new
String
(
bytes
);
}
/**
* Loads RSA/DSA private key in a PEM format into {@link KeyPair}.
*/
public
static
KeyPair
loadKey
(
String
pemString
)
throws
IOException
,
GeneralSecurityException
{
Object
key
=
PEMDecoder
.
decode
(
pemString
.
toCharArray
(),
null
);
public
static
KeyPair
loadKey
(
String
pemString
,
String
passwd
)
throws
IOException
,
GeneralSecurityException
{
Object
key
=
PEMDecoder
.
decode
(
pemString
.
toCharArray
(),
passwd
);
if
(
key
instanceof
com
.
trilead
.
ssh2
.
signature
.
RSAPrivateKey
)
{
com
.
trilead
.
ssh2
.
signature
.
RSAPrivateKey
x
=
(
com
.
trilead
.
ssh2
.
signature
.
RSAPrivateKey
)
key
;
// System.out.println("ssh-rsa " + new String(Base64.encode(RSASHA1Verify.encodeSSHRSAPublicKey(x.getPublicKey()))));
...
...
@@ -462,6 +475,37 @@ public class CLI {
throw
new
UnsupportedOperationException
(
"Unrecognizable key format: "
+
key
);
}
public
static
KeyPair
loadKey
(
String
pemString
)
throws
IOException
,
GeneralSecurityException
{
return
loadKey
(
pemString
,
null
);
}
private
static
KeyPair
tryEncryptedFile
(
File
f
)
throws
IOException
,
GeneralSecurityException
{
KeyPair
kp
=
null
;
if
(
isPemEncrypted
(
f
)){
String
passwd
=
askForPasswd
(
f
.
getCanonicalPath
());
kp
=
loadKey
(
f
,
passwd
);
}
return
kp
;
}
private
static
boolean
isPemEncrypted
(
File
f
)
throws
IOException
{
String
pemString
=
readPemFile
(
f
);
//simple check if the file is encrypted
if
(
pemString
.
contains
(
"4,ENCRYPTED"
))
return
true
;
return
false
;
}
private
static
String
askForPasswd
(
String
filePath
){
Console
cons
=
System
.
console
();
String
passwd
=
null
;
if
(
cons
!=
null
){
char
[]
p
=
cons
.
readPassword
(
"%s"
,
"Enter passphrase for "
+
filePath
+
":"
);
passwd
=
String
.
valueOf
(
p
);
}
return
passwd
;
}
/**
* try all the default key locations
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录