Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge user port changes with extension forwarded ports #180694

Merged
merged 3 commits into from
Apr 25, 2023
Merged

Merge user port changes with extension forwarded ports #180694

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7f1fe0
Merge user port changes with extension forwards
alexr00 Apr 24, 2023
e7fc73e
Actually add port to unrestoredExtensionTunnels
alexr00 Apr 24, 2023
d2dbdf7
nit
alexr00 Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/vs/workbench/services/remote/common/remoteExplorerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ export class TunnelModel extends Disposable {
public readonly configPortsAttributes: PortsAttributes;
private restoreListener: IDisposable | undefined;
private knownPortsRestoreValue: string | undefined;
private unrestoredExtensionTunnels: Map<string, Tunnel> = new Map();

private portAttributesProviders: PortAttributesProvider[] = [];

Expand Down Expand Up @@ -551,14 +552,18 @@ export class TunnelModel extends Disposable {
const tunnels = <Tunnel[] | undefined>JSON.parse(tunnelRestoreValue) ?? [];
this.logService.trace(`ForwardedPorts: (TunnelModel) restoring ports ${tunnels.map(tunnel => tunnel.remotePort).join(', ')}`);
for (const tunnel of tunnels) {
if (!mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort)) {
const alreadyForwarded = mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort);
// Extension forwarded ports should only be updated, not restored.
if ((tunnel.source.source === TunnelSource.User && !alreadyForwarded) || (tunnel.source.source === TunnelSource.Extension && alreadyForwarded)) {
await this.forward({
remote: { host: tunnel.remoteHost, port: tunnel.remotePort },
local: tunnel.localPort,
name: tunnel.name,
privacy: tunnel.privacy,
elevateIfNeeded: true
});
} else if (tunnel.source.source === TunnelSource.Extension && !alreadyForwarded) {
this.unrestoredExtensionTunnels.set(makeAddress(tunnel.remoteHost, tunnel.remotePort), tunnel);
}
}
}
Expand All @@ -580,7 +585,7 @@ export class TunnelModel extends Disposable {
@debounce(1000)
private async storeForwarded() {
if (this.configurationService.getValue('remote.restoreForwardedPorts')) {
const valueToStore = JSON.stringify(Array.from(this.forwarded.values()).filter(value => value.source.source === TunnelSource.User));
const valueToStore = JSON.stringify(Array.from(this.forwarded.values()).filter(value => value.source.source !== TunnelSource.Auto));
if (valueToStore !== this.knownPortsRestoreValue) {
this.knownPortsRestoreValue = valueToStore;
const key = await this.getStorageKey();
Expand Down Expand Up @@ -626,7 +631,7 @@ export class TunnelModel extends Disposable {

const key = makeAddress(tunnelProperties.remote.host, tunnelProperties.remote.port);
this.inProgress.set(key, true);
const tunnel = await this.tunnelService.openTunnel(addressProvider, tunnelProperties.remote.host, tunnelProperties.remote.port, undefined, localPort, (!tunnelProperties.elevateIfNeeded) ? attributes?.elevateIfNeeded : tunnelProperties.elevateIfNeeded, tunnelProperties.privacy, attributes?.protocol);
let tunnel = await this.tunnelService.openTunnel(addressProvider, tunnelProperties.remote.host, tunnelProperties.remote.port, undefined, localPort, (!tunnelProperties.elevateIfNeeded) ? attributes?.elevateIfNeeded : tunnelProperties.elevateIfNeeded, tunnelProperties.privacy, attributes?.protocol);
if (tunnel && tunnel.localAddress) {
const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces<CandidatePort>(this._candidates ?? new Map(), tunnelProperties.remote.host, tunnelProperties.remote.port);
const protocol = (tunnel.protocol ?
Expand All @@ -653,6 +658,19 @@ export class TunnelModel extends Disposable {
await this.storeForwarded();
await this.showPortMismatchModalIfNeeded(tunnel, localPort, attributes);
this._onForwardPort.fire(newForward);
if (this.unrestoredExtensionTunnels.has(key)) {
const updateProps = this.unrestoredExtensionTunnels.get(key);
this.unrestoredExtensionTunnels.delete(key);
if (updateProps) {
tunnel = await this.forward({
remote: { host: newForward.remoteHost, port: newForward.remotePort },
local: newForward.localPort,
name: newForward.name,
privacy: updateProps.privacy,
elevateIfNeeded: true,
});
}
}
return tunnel;
}
this.inProgress.delete(key);
Expand Down