Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add regular expressions and "others" to portsAttributes

Browse Source 
Fixes microsoft/vscode-remote-release#4623
This commit is contained in:
Alex Ross
2021-03-10 14:12:29 +01:00
parent 1422de1111
commit da562fa27c
3 changed files with 91 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/vs/workbench/services/remote/common/remoteExplorerService.ts
View File

@@ -146,14 +146,18 @@ interface Attributes {
elevateIfNeeded: boolean | undefined;
}
interface PortRange { start: number, end: number }
interface PortAttributes extends Attributes {
port: number | { start: number, end: number };
key: number | PortRange | RegExp;
}
export class PortsAttributes extends Disposable {
private static SETTING = 'remote.portsAttributes';
private static RANGE = /^(\d+)\-(\d+)$/;
private static OTHERS = 'others';
private portsAttributes: PortAttributes[] = [];
private otherPortAttributes: Attributes | undefined;
private _onDidChangeAttributes = new Emitter<void>();
public readonly onDidChangeAttributes = this._onDidChangeAttributes.event;
@@ -172,8 +176,8 @@ export class PortsAttributes extends Disposable {
this._onDidChangeAttributes.fire();
}
getAttributes(port: number): Attributes | undefined {
let index = this.findNextIndex(port, this.portsAttributes, 0);
getAttributes(port: number, commandLine?: string): Attributes | undefined {
let index = this.findNextIndex(port, commandLine, this.portsAttributes, 0);
const attributes: Attributes = {
label: undefined,
onAutoForward: undefined,
@@ -181,31 +185,43 @@ export class PortsAttributes extends Disposable {
};
while (index >= 0) {
const found = this.portsAttributes[index];
if (found.port === port) {
if (found.key === port) {
attributes.onAutoForward = found.onAutoForward ?? attributes.onAutoForward;
attributes.elevateIfNeeded = (found.elevateIfNeeded !== undefined) ? found.elevateIfNeeded : attributes.elevateIfNeeded;
attributes.label = found.label ?? attributes.label;
} else {
// It's a range, which means that if the attribute is already set, we keep it
// It's a range or regex, which means that if the attribute is already set, we keep it
attributes.onAutoForward = attributes.onAutoForward ?? found.onAutoForward;
attributes.elevateIfNeeded = (attributes.elevateIfNeeded !== undefined) ? attributes.elevateIfNeeded : found.elevateIfNeeded;
attributes.label = attributes.label ?? found.label;
}
index = this.findNextIndex(port, this.portsAttributes, index + 1);
index = this.findNextIndex(port, commandLine, this.portsAttributes, index + 1);
}
if (attributes.onAutoForward !== undefined || attributes.elevateIfNeeded !== undefined || attributes.label !== undefined) {
return attributes;
}
return undefined;
// If we find no matches, then use the other port attributes.
return this.getOtherAttributes();
}
private findNextIndex(port: number, attributes: PortAttributes[], fromIndex: number): number {
private hasStartEnd(value: number | PortRange | RegExp): value is PortRange {
return ((<any>value).start !== undefined) && ((<any>value).end !== undefined);
}
private findNextIndex(port: number, commandLine: string | undefined, attributes: PortAttributes[], fromIndex: number): number {
if (fromIndex >= attributes.length) {
return -1;
}
const sliced = attributes.slice(fromIndex);
const foundIndex = sliced.findIndex((value) => {
return isNumber(value.port) ? (value.port === port) : (port >= value.port.start && port <= value.port.end);
if (isNumber(value.key)) {
return value.key === port;
} else if (this.hasStartEnd(value.key)) {
return port >= value.key.start && port <= value.key.end;
} else {
return commandLine ? value.key.test(commandLine) : -1;
}
});
return foundIndex >= 0 ? foundIndex + fromIndex : -1;
}
@@ -217,31 +233,63 @@ export class PortsAttributes extends Disposable {
}
const attributes: PortAttributes[] = [];
for (let portNumber in settingValue) {
const setting = (<any>settingValue)[portNumber];
let port: number | { start: number, end: number } | undefined = undefined;
if (portNumber !== undefined) {
if (Number(portNumber)) {
port = Number(portNumber);
} else if (isString(portNumber) && PortsAttributes.RANGE.test(portNumber)) {
const match = (<string>portNumber).match(PortsAttributes.RANGE);
port = { start: Number(match![1]), end: Number(match![2]) };
for (let attributesKey in settingValue) {
if (attributesKey === undefined) {
continue;
}
const setting = (<any>settingValue)[attributesKey];
let key: number | { start: number, end: number } | RegExp | undefined = undefined;
if (Number(attributesKey)) {
key = Number(attributesKey);
} else if (attributesKey === PortsAttributes.OTHERS) {
this.otherPortAttributes = {
elevateIfNeeded: setting.elevateIfPrivileged,
onAutoForward: setting.onAutoForward,
label: setting.label
};
} else if (isString(attributesKey)) {
if (PortsAttributes.RANGE.test(attributesKey)) {
const match = (<string>attributesKey).match(PortsAttributes.RANGE);
key = { start: Number(match![1]), end: Number(match![2]) };
} else {
const regTest: RegExp = RegExp(attributesKey);
if (regTest) {
key = regTest;
}
}
}
if (!port) {
if (!key) {
continue;
}
attributes.push({
port,
key: key,
elevateIfNeeded: setting.elevateIfPrivileged,
onAutoForward: setting.onAutoForward,
label: setting.label
});
}
attributes.sort((a, b) => {
return (isNumber(a.port) ? a.port : a.port.start) - (isNumber(b.port) ? b.port : b.port.start);
return this.sortAttributes(attributes);
}
private sortAttributes(attributes: PortAttributes[]): PortAttributes[] {
function getVal(item: PortAttributes, thisRef: PortsAttributes) {
if (isNumber(item.key)) {
return item.key;
} else if (thisRef.hasStartEnd(item.key)) {
return item.key.start;
} else {
return Number.MAX_VALUE;
}
}
return attributes.sort((a, b) => {
return getVal(a, this) - getVal(b, this);
});
return attributes;
}
private getOtherAttributes() {
return this.otherPortAttributes;
}
static providedActionToAction(providedAction: ProvidedOnAutoForward | undefined) {
@@ -565,17 +613,6 @@ export class TunnelModel extends Disposable {
}
async getAttributes(ports: number[], checkProviders: boolean = true): Promise<Map<number, Attributes> | undefined> {
const configAttributes: Map<number, Attributes> = new Map();
ports.forEach(port => {
const attributes = this.configPortsAttributes.getAttributes(port);
if (attributes) {
configAttributes.set(port, attributes);
}
});
if ((this.portAttributesProviders.length === 0) || !checkProviders) {
return (configAttributes.size > 0) ? configAttributes : undefined;
}
const matchingCandidates: Map<number, CandidatePort> = new Map();
const pidToPortsMapping: Map<number, number[]> = new Map();
ports.forEach(port => {
@@ -588,6 +625,18 @@ export class TunnelModel extends Disposable {
pidToPortsMapping.get(matchingCandidate.pid)?.push(port);
}
});
const configAttributes: Map<number, Attributes> = new Map();
ports.forEach(port => {
const attributes = this.configPortsAttributes.getAttributes(port, matchingCandidates.get(port)?.detail);
if (attributes) {
configAttributes.set(port, attributes);
}
});
if ((this.portAttributesProviders.length === 0) || !checkProviders) {
return (configAttributes.size > 0) ? configAttributes : undefined;
}
// Group calls to provide attributes by pid.
const allProviderResults = await Promise.all(flatten(this.portAttributesProviders.map(provider => {
return Array.from(pidToPortsMapping.entries()).map(entry => {