Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
后端镜像
Tabby
提交
e6fd31e0
T
Tabby
项目概览
后端镜像
/
Tabby
通知
31
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Tabby
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e6fd31e0
编写于
12月 06, 2020
作者:
E
Eugene Pankov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't try to load the private key if not selected - fixes #2968
上级
7977c1d6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
14 deletion
+25
-14
terminus-ssh/src/services/ssh.service.ts
terminus-ssh/src/services/ssh.service.ts
+25
-14
未找到文件。
terminus-ssh/src/services/ssh.service.ts
浏览文件 @
e6fd31e0
...
...
@@ -22,6 +22,11 @@ try {
var
windowsProcessTreeNative
=
require
(
'
windows-process-tree/build/Release/windows_process_tree.node
'
)
// eslint-disable-line @typescript-eslint/no-var-requires, no-var
}
catch
{
}
// eslint-disable-next-line @typescript-eslint/no-type-alias
export
type
SSHLogCallback
=
(
message
:
string
)
=>
void
@
Injectable
({
providedIn
:
'
root
'
})
export
class
SSHService
{
private
logger
:
Logger
...
...
@@ -46,33 +51,24 @@ export class SSHService {
return
session
}
async
connectSession
(
session
:
SSHSession
,
logCallback
?:
(
s
:
any
)
=>
void
):
Promise
<
void
>
{
async
loadPrivateKeyForSession
(
session
:
SSHSession
,
logCallback
?:
SSHLogCallback
):
Promise
<
string
|
null
>
{
let
privateKey
:
string
|
null
=
null
let
privateKeyPath
=
session
.
connection
.
privateKey
if
(
!
logCallback
)
{
logCallback
=
()
=>
null
}
const
log
=
(
s
:
any
)
=>
{
logCallback
!
(
s
)
this
.
logger
.
info
(
s
)
}
if
(
!
privateKeyPath
)
{
const
userKeyPath
=
path
.
join
(
process
.
env
.
HOME
as
string
,
'
.ssh
'
,
'
id_rsa
'
)
if
(
await
fs
.
exists
(
userKeyPath
))
{
log
(
'
Using user
\'
s default private key
'
)
log
Callback
?.
(
'
Using user
\'
s default private key
'
)
privateKeyPath
=
userKeyPath
}
}
if
(
privateKeyPath
)
{
log
(
'
Loading private key from
'
+
colors
.
bgWhite
.
blackBright
(
'
'
+
privateKeyPath
+
'
'
))
log
Callback
?.
(
'
Loading private key from
'
+
colors
.
bgWhite
.
blackBright
(
'
'
+
privateKeyPath
+
'
'
))
try
{
privateKey
=
(
await
fs
.
readFile
(
privateKeyPath
)).
toString
()
}
catch
(
error
)
{
log
(
colors
.
bgRed
.
black
(
'
X
'
)
+
'
Could not read the private key file
'
)
log
Callback
?.
(
colors
.
bgRed
.
black
(
'
X
'
)
+
'
Could not read the private key file
'
)
this
.
toastr
.
error
(
'
Could not read the private key file
'
)
}
...
...
@@ -83,7 +79,7 @@ export class SSHService {
}
catch
(
e
)
{
if
(
e
instanceof
sshpk
.
KeyEncryptedError
)
{
const
modal
=
this
.
ngbModal
.
open
(
PromptModalComponent
)
log
(
colors
.
bgYellow
.
yellow
.
black
(
'
!
'
)
+
'
Key requires passphrase
'
)
log
Callback
?.
(
colors
.
bgYellow
.
yellow
.
black
(
'
!
'
)
+
'
Key requires passphrase
'
)
modal
.
componentInstance
.
prompt
=
'
Private key passphrase
'
modal
.
componentInstance
.
password
=
true
let
passphrase
=
''
...
...
@@ -131,6 +127,20 @@ export class SSHService {
fs
.
unlink
(
temp
.
path
)
}
}
return
privateKey
}
async
connectSession
(
session
:
SSHSession
,
logCallback
?:
SSHLogCallback
):
Promise
<
void
>
{
if
(
!
logCallback
)
{
logCallback
=
()
=>
null
}
const
log
=
(
s
:
any
)
=>
{
logCallback
!
(
s
)
this
.
logger
.
info
(
s
)
}
let
privateKey
:
string
|
null
=
null
const
ssh
=
new
Client
()
session
.
ssh
=
ssh
...
...
@@ -213,6 +223,7 @@ export class SSHService {
const
authMethodsLeft
=
[
'
none
'
]
if
(
!
session
.
connection
.
auth
||
session
.
connection
.
auth
===
'
publicKey
'
)
{
privateKey
=
await
this
.
loadPrivateKeyForSession
(
session
,
log
)
if
(
!
privateKey
)
{
log
(
'
\r\n
Private key auth selected, but no key is loaded
\r\n
'
)
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录