Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bdd072e5
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
bdd072e5
编写于
4月 16, 2021
作者:
A
Alexandru Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add trust prompt
上级
ce791d27
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
44 addition
and
1 deletion
+44
-1
src/vs/platform/remote/common/remoteAuthorityResolver.ts
src/vs/platform/remote/common/remoteAuthorityResolver.ts
+7
-0
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+9
-0
src/vs/workbench/api/common/extHost.api.impl.ts
src/vs/workbench/api/common/extHost.api.impl.ts
+2
-0
src/vs/workbench/services/extensions/common/extensionHostManager.ts
...kbench/services/extensions/common/extensionHostManager.ts
+1
-1
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
.../services/extensions/electron-browser/extensionService.ts
+25
-0
未找到文件。
src/vs/platform/remote/common/remoteAuthorityResolver.ts
浏览文件 @
bdd072e5
...
...
@@ -15,6 +15,13 @@ export interface ResolvedAuthority {
readonly
connectionToken
:
string
|
undefined
;
}
export
enum
RemoteTrustOption
{
Unknown
=
0
,
DisableTrust
=
1
,
MachineTrusted
=
2
,
MachineUntrusted
=
3
}
export
interface
ResolvedOptions
{
readonly
extensionHostEnv
?:
{
[
key
:
string
]:
string
|
null
};
}
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
bdd072e5
...
...
@@ -80,8 +80,17 @@ declare module 'vscode' {
constructor
(
host
:
string
,
port
:
number
,
connectionToken
?:
string
);
}
export
enum
RemoteTrustOption
{
Unknown
=
0
,
DisableTrust
=
1
,
MachineTrusted
=
2
,
MachineUntrusted
=
3
}
export
interface
ResolvedOptions
{
extensionHostEnv
?:
{
[
key
:
string
]:
string
|
null
;
};
trust
?:
RemoteTrustOption
;
}
export
interface
TunnelOptions
{
...
...
src/vs/workbench/api/common/extHost.api.impl.ts
浏览文件 @
bdd072e5
...
...
@@ -85,6 +85,7 @@ import { IExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
import
{
ExtHostEditorTabs
}
from
'
vs/workbench/api/common/extHostEditorTabs
'
;
import
{
IExtHostTelemetry
}
from
'
vs/workbench/api/common/extHostTelemetry
'
;
import
{
ExtHostNotebookKernels
}
from
'
vs/workbench/api/common/extHostNotebookKernels
'
;
import
{
RemoteTrustOption
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
export
interface
IExtensionApiFactory
{
(
extension
:
IExtensionDescription
,
registry
:
ExtensionDescriptionRegistry
,
configProvider
:
ExtHostConfigProvider
):
typeof
vscode
;
...
...
@@ -1240,6 +1241,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
InlineHint
:
extHostTypes
.
InlineHint
,
InlineHintKind
:
extHostTypes
.
InlineHintKind
,
RemoteAuthorityResolverError
:
extHostTypes
.
RemoteAuthorityResolverError
,
RemoteTrustOption
:
RemoteTrustOption
,
ResolvedAuthority
:
extHostTypes
.
ResolvedAuthority
,
SourceControlInputBoxValidationType
:
extHostTypes
.
SourceControlInputBoxValidationType
,
ExtensionRuntime
:
extHostTypes
.
ExtensionRuntime
,
...
...
src/vs/workbench/services/extensions/common/extensionHostManager.ts
浏览文件 @
bdd072e5
...
...
@@ -71,7 +71,7 @@ export class ExtensionHostManager extends Disposable {
return
{
value
:
this
.
_createExtensionHostCustomers
(
protocol
)
};
},
(
err
)
=>
{
console
.
error
(
'
Error received from starting extension host
'
);
console
.
error
(
`Error received from starting extension host (kind:
${
this
.
kind
}
)`
);
console
.
error
(
err
);
return
null
;
}
...
...
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
浏览文件 @
bdd072e5
...
...
@@ -42,6 +42,9 @@ import { Schemas } from 'vs/base/common/network';
import
{
ExtensionHostExitCode
}
from
'
vs/workbench/services/extensions/common/extensionHostProtocol
'
;
import
{
updateProxyConfigurationsScope
}
from
'
vs/platform/request/common/request
'
;
import
{
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
const
MACHINE_PROMPT
=
false
;
export
class
ExtensionService
extends
AbstractExtensionService
implements
IExtensionService
{
...
...
@@ -69,6 +72,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
@
IRemoteExplorerService
private
readonly
_remoteExplorerService
:
IRemoteExplorerService
,
@
IExtensionGalleryService
private
readonly
_extensionGalleryService
:
IExtensionGalleryService
,
@
ILogService
private
readonly
_logService
:
ILogService
,
@
IDialogService
private
readonly
_dialogService
:
IDialogService
,
)
{
super
(
new
ExtensionRunningLocationClassifier
(
...
...
@@ -358,6 +362,27 @@ export class ExtensionService extends AbstractExtensionService implements IExten
return
;
}
if
(
MACHINE_PROMPT
)
{
const
dialogResult
=
await
this
.
_dialogService
.
show
(
Severity
.
Warning
,
nls
.
localize
(
'
machineTrustQuestion
'
,
"
Do you trust the machine you're connecting to?
"
),
[
nls
.
localize
(
'
yes
'
,
"
Yes, connect.
"
),
nls
.
localize
(
'
no
'
,
"
No, disconnect.
"
)],
{
cancelId
:
1
,
useCustom
:
true
,
// checkbox: { label: nls.localize('remember', "Remember my choice"), checked: true }
}
);
if
(
dialogResult
.
choice
!==
0
)
{
// Did not confirm trust
this
.
_notificationService
.
notify
({
severity
:
Severity
.
Warning
,
message
:
nls
.
localize
(
'
trustFailure
'
,
"
Refused to connect to untrusted machine.
"
)
});
// Proceed with the local extension host
await
this
.
_startLocalExtensionHost
(
localExtensions
);
return
;
}
}
// set the resolved authority
this
.
_remoteAuthorityResolverService
.
_setResolvedAuthority
(
resolverResult
.
authority
,
resolverResult
.
options
);
this
.
_remoteExplorerService
.
setTunnelInformation
(
resolverResult
.
tunnelInformation
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录