Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
30ae7bde
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,发现更多精彩内容 >>
未验证
提交
30ae7bde
编写于
4月 16, 2021
作者:
A
Alexandru Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Respect resolver's trust options
上级
78872ce6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
21 addition
and
9 deletion
+21
-9
extensions/vscode-test-resolver/src/extension.ts
extensions/vscode-test-resolver/src/extension.ts
+2
-1
src/vs/platform/remote/common/remoteAuthorityResolver.ts
src/vs/platform/remote/common/remoteAuthorityResolver.ts
+2
-2
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+1
-2
src/vs/workbench/api/common/extHostExtensionService.ts
src/vs/workbench/api/common/extHostExtensionService.ts
+2
-1
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
.../services/extensions/electron-browser/extensionService.ts
+14
-3
未找到文件。
extensions/vscode-test-resolver/src/extension.ts
浏览文件 @
30ae7bde
...
...
@@ -203,7 +203,8 @@ export function activate(context: vscode.ExtensionContext) {
proxyServer
.
listen
(
0
,
()
=>
{
const
port
=
(
<
net
.
AddressInfo
>
proxyServer
.
address
()).
port
;
outputChannel
.
appendLine
(
`Going through proxy at port
${
port
}
`
);
res
(
new
vscode
.
ResolvedAuthority
(
'
127.0.0.1
'
,
port
));
const
r
:
vscode
.
ResolverResult
=
new
vscode
.
ResolvedAuthority
(
'
127.0.0.1
'
,
port
);
res
(
r
);
});
context
.
subscriptions
.
push
({
dispose
:
()
=>
{
...
...
src/vs/platform/remote/common/remoteAuthorityResolver.ts
浏览文件 @
30ae7bde
...
...
@@ -18,12 +18,12 @@ export interface ResolvedAuthority {
export
enum
RemoteTrustOption
{
Unknown
=
0
,
DisableTrust
=
1
,
MachineTrusted
=
2
,
MachineUntrusted
=
3
MachineTrusted
=
2
}
export
interface
ResolvedOptions
{
readonly
extensionHostEnv
?:
{
[
key
:
string
]:
string
|
null
};
readonly
trust
?:
RemoteTrustOption
;
}
export
interface
TunnelDescription
{
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
30ae7bde
...
...
@@ -83,8 +83,7 @@ declare module 'vscode' {
export
enum
RemoteTrustOption
{
Unknown
=
0
,
DisableTrust
=
1
,
MachineTrusted
=
2
,
MachineUntrusted
=
3
MachineTrusted
=
2
}
export
interface
ResolvedOptions
{
...
...
src/vs/workbench/api/common/extHostExtensionService.ts
浏览文件 @
30ae7bde
...
...
@@ -668,7 +668,8 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
connectionToken
:
result
.
connectionToken
};
const
options
:
ResolvedOptions
=
{
extensionHostEnv
:
result
.
extensionHostEnv
extensionHostEnv
:
result
.
extensionHostEnv
,
trust
:
result
.
trust
};
return
{
...
...
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
浏览文件 @
30ae7bde
...
...
@@ -15,7 +15,7 @@ import { IWorkbenchExtensionEnablementService, EnablementState, IWebExtensionsSc
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IRemoteExtensionHostDataProvider
,
RemoteExtensionHost
,
IRemoteExtensionHostInitData
}
from
'
vs/workbench/services/extensions/common/remoteExtensionHost
'
;
import
{
IRemoteAgentService
}
from
'
vs/workbench/services/remote/common/remoteAgentService
'
;
import
{
IRemoteAuthorityResolverService
,
RemoteAuthorityResolverError
,
ResolverResult
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
import
{
IRemoteAuthorityResolverService
,
RemoteAuthorityResolverError
,
Re
moteTrustOption
,
Re
solverResult
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILifecycleService
,
LifecyclePhase
}
from
'
vs/workbench/services/lifecycle/common/lifecycle
'
;
import
{
INotificationService
,
Severity
}
from
'
vs/platform/notification/common/notification
'
;
...
...
@@ -44,6 +44,7 @@ import { updateProxyConfigurationsScope } from 'vs/platform/request/common/reque
import
{
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
Codicon
}
from
'
vs/base/common/codicons
'
;
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
IWorkspaceTrustManagementService
}
from
'
vs/platform/workspace/common/workspaceTrust
'
;
const
MACHINE_PROMPT
=
false
;
...
...
@@ -74,6 +75,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
@
IExtensionGalleryService
private
readonly
_extensionGalleryService
:
IExtensionGalleryService
,
@
ILogService
private
readonly
_logService
:
ILogService
,
@
IDialogService
private
readonly
_dialogService
:
IDialogService
,
@
IWorkspaceTrustManagementService
private
readonly
_workspaceTrustManagementService
:
IWorkspaceTrustManagementService
,
)
{
super
(
new
ExtensionRunningLocationClassifier
(
...
...
@@ -363,11 +365,20 @@ export class ExtensionService extends AbstractExtensionService implements IExten
return
;
}
if
(
MACHINE_PROMPT
)
{
let
promptForMachineTrust
=
MACHINE_PROMPT
;
if
(
resolverResult
.
options
?.
trust
===
RemoteTrustOption
.
DisableTrust
)
{
promptForMachineTrust
=
false
;
this
.
_workspaceTrustManagementService
.
setWorkspaceTrust
(
true
);
}
else
if
(
resolverResult
.
options
?.
trust
===
RemoteTrustOption
.
MachineTrusted
)
{
promptForMachineTrust
=
false
;
}
if
(
promptForMachineTrust
)
{
const
dialogResult
=
await
this
.
_dialogService
.
show
(
Severity
.
Info
,
nls
.
localize
(
'
machineTrustQuestion
'
,
"
Do you trust the machine you're connecting to?
"
),
[
nls
.
localize
(
'
yes
'
,
"
Yes, connect.
"
),
nls
.
localize
(
'
no
'
,
"
No, d
is
connect.
"
)],
[
nls
.
localize
(
'
yes
'
,
"
Yes, connect.
"
),
nls
.
localize
(
'
no
'
,
"
No, d
o not
connect.
"
)],
{
cancelId
:
1
,
custom
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录