Skip to content

Commit 79e83ab

Browse files
committed
Go back to using buitlin URL
This reverts commit 0148141.
1 parent 616cad0 commit 79e83ab

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

build/lib/layersChecker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ const RULES = [
190190
'pathname',
191191
'search',
192192
'username',
193-
'password'
193+
'password',
194+
'origin'
194195
],
195196
disallowedDefinitions: [
196197
'lib.dom.d.ts' // no DOM

build/lib/layersChecker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ const RULES = [
206206
'pathname',
207207
'search',
208208
'username',
209-
'password'
209+
'password',
210+
'origin'
210211
],
211212
disallowedDefinitions: [
212213
'lib.dom.d.ts' // no DOM

src/vs/server/node/remoteExtensionHostAgentServer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ export class RemoteExtensionHostAgentServer extends Disposable implements IServe
149149
responseHeaders['Vary'] = 'Origin';
150150
const requestOrigin = req.headers['origin'];
151151
if (requestOrigin && this._webEndpointOriginChecker.matches(requestOrigin)) {
152-
console.log(`setting Access-Control-Allow-Origin`);
153152
responseHeaders['Access-Control-Allow-Origin'] = requestOrigin;
154153
}
155154

@@ -790,13 +789,13 @@ class WebEndpointOriginChecker {
790789
}
791790

792791
const uuid = generateUuid();
793-
const exampleUri = URI.parse(
792+
const exampleUrl = new URL(
794793
webEndpointUrlTemplate
795794
.replace('{{uuid}}', uuid)
796795
.replace('{{commit}}', commit)
797796
.replace('{{quality}}', quality)
798797
);
799-
const exampleOrigin = `${exampleUri.scheme}://${exampleUri.authority}`;
798+
const exampleOrigin = exampleUrl.origin;
800799
const originRegExpSource = (
801800
escapeRegExpCharacters(exampleOrigin)
802801
.replace(uuid, '[a-zA-Z0-9\-]+')

0 commit comments

Comments
 (0)