@casual-simulation/aux-vm-browser 3.2.13 → 3.2.14-alpha.7893057655
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/managers/AuthCoordinator.d.ts +2 -2
- package/managers/AuthCoordinator.js +1 -1
- package/managers/AuthCoordinator.js.map +1 -1
- package/package.json +9 -9
- package/vm/AuxVMImpl.d.ts +3 -1
- package/vm/AuxVMImpl.js +10 -2
- package/vm/AuxVMImpl.js.map +1 -1
- package/vm/AuxVMUtils.d.ts +13 -0
- package/vm/AuxVMUtils.js +44 -0
- package/vm/AuxVMUtils.js.map +1 -0
|
@@ -2,7 +2,7 @@ import { Observable, SubscriptionLike } from 'rxjs';
|
|
|
2
2
|
import { BrowserSimulation } from './BrowserSimulation';
|
|
3
3
|
import { AuthHelperInterface, SimulationManager } from '@casual-simulation/aux-vm/managers';
|
|
4
4
|
import { AuthHelper } from './AuthHelper';
|
|
5
|
-
import {
|
|
5
|
+
import { AuthorizeActionMissingPermission } from '@casual-simulation/aux-common';
|
|
6
6
|
import { LoginStatus } from '@casual-simulation/aux-vm/auth';
|
|
7
7
|
/**
|
|
8
8
|
* Defines a class that is able to coordinate authentication across multiple simulations.
|
|
@@ -44,7 +44,7 @@ export interface MissingPermissionEvent {
|
|
|
44
44
|
simulationId: string;
|
|
45
45
|
errorCode: string;
|
|
46
46
|
errorMessage: string;
|
|
47
|
-
reason:
|
|
47
|
+
reason: AuthorizeActionMissingPermission;
|
|
48
48
|
origin: string;
|
|
49
49
|
}
|
|
50
50
|
export interface ShowAccountInfoEvent {
|
|
@@ -253,7 +253,7 @@ export class AuthCoordinator {
|
|
|
253
253
|
}
|
|
254
254
|
_handleMissingPermission(sim, request, reason) {
|
|
255
255
|
return __awaiter(this, void 0, void 0, function* () {
|
|
256
|
-
console.log(`[AuthCoordinator] [${sim.id}] Missing permission ${reason.
|
|
256
|
+
console.log(`[AuthCoordinator] [${sim.id}] Missing permission ${reason.resourceKind}.${reason.action}.`);
|
|
257
257
|
this._onMissingPermission.next({
|
|
258
258
|
simulationId: sim.id,
|
|
259
259
|
errorCode: request.errorCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthCoordinator.js","sourceRoot":"","sources":["AuthCoordinator.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,eAAe,EACf,KAAK,EAEL,OAAO,EACP,YAAY,EAGZ,SAAS,GACZ,MAAM,MAAM,CAAC;AAQd,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,
|
|
1
|
+
{"version":3,"file":"AuthCoordinator.js","sourceRoot":"","sources":["AuthCoordinator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-browser",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.14-alpha.7893057655",
|
|
4
4
|
"description": "A set of utilities required to securely run an AUX in a web browser.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -40,13 +40,13 @@
|
|
|
40
40
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@casual-simulation/aux-common": "^3.2.
|
|
44
|
-
"@casual-simulation/aux-records": "^3.2.
|
|
45
|
-
"@casual-simulation/aux-runtime": "^3.2.
|
|
46
|
-
"@casual-simulation/aux-vm": "^3.2.
|
|
47
|
-
"@casual-simulation/aux-vm-client": "^3.2.
|
|
48
|
-
"@casual-simulation/aux-websocket": "^3.2.
|
|
49
|
-
"@casual-simulation/aux-websocket-aws": "^3.2.
|
|
43
|
+
"@casual-simulation/aux-common": "^3.2.14-alpha.7893057655",
|
|
44
|
+
"@casual-simulation/aux-records": "^3.2.14-alpha.7893057655",
|
|
45
|
+
"@casual-simulation/aux-runtime": "^3.2.14-alpha.7893057655",
|
|
46
|
+
"@casual-simulation/aux-vm": "^3.2.14-alpha.7893057655",
|
|
47
|
+
"@casual-simulation/aux-vm-client": "^3.2.14-alpha.7893057655",
|
|
48
|
+
"@casual-simulation/aux-websocket": "^3.2.14-alpha.7893057655",
|
|
49
|
+
"@casual-simulation/aux-websocket-aws": "^3.2.14-alpha.7893057655",
|
|
50
50
|
"@casual-simulation/crypto": "^3.2.7",
|
|
51
51
|
"@casual-simulation/crypto-browser": "^3.2.7",
|
|
52
52
|
"@casual-simulation/websocket": "^3.2.7",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"rxjs": "7.5.7",
|
|
59
59
|
"uuid": "^8.3.2"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "937496446cf48d34fd5e0da41a53b4616b386f1b"
|
|
62
62
|
}
|
package/vm/AuxVMImpl.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
28
28
|
private _channel;
|
|
29
29
|
private _proxy;
|
|
30
30
|
private _id;
|
|
31
|
+
private _relaxOrigin;
|
|
31
32
|
closed: boolean;
|
|
32
33
|
/**
|
|
33
34
|
* The ID of the simulation.
|
|
@@ -38,8 +39,9 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
38
39
|
* Creates a new Simulation VM.
|
|
39
40
|
* @param id The ID of the simulation.
|
|
40
41
|
* @param config The config that should be used.
|
|
42
|
+
* @param relaxOrigin Whether to relax the origin of the VM.
|
|
41
43
|
*/
|
|
42
|
-
constructor(id: string, config: AuxConfig);
|
|
44
|
+
constructor(id: string, config: AuxConfig, relaxOrigin?: boolean);
|
|
43
45
|
get subVMAdded(): Observable<AuxSubVM>;
|
|
44
46
|
get subVMRemoved(): Observable<AuxSubVM>;
|
|
45
47
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
package/vm/AuxVMImpl.js
CHANGED
|
@@ -14,6 +14,7 @@ import { loadScript, setupChannel, waitForLoad } from '../html/IFrameHelpers';
|
|
|
14
14
|
import { remapProgressPercent, } from '@casual-simulation/aux-common';
|
|
15
15
|
import axios from 'axios';
|
|
16
16
|
import { RemoteAuxVM } from '@casual-simulation/aux-vm-client';
|
|
17
|
+
import { getBaseOrigin, getVMOrigin } from './AuxVMUtils';
|
|
17
18
|
export const DEFAULT_IFRAME_ALLOW_ATTRIBUTE = 'accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking';
|
|
18
19
|
export const DEFAULT_IFRAME_SANDBOX_ATTRIBUTE = 'allow-forms allow-modals allow-popups allow-presentation allow-same-origin allow-scripts allow-downloads';
|
|
19
20
|
/**
|
|
@@ -34,10 +35,12 @@ export class AuxVMImpl {
|
|
|
34
35
|
* Creates a new Simulation VM.
|
|
35
36
|
* @param id The ID of the simulation.
|
|
36
37
|
* @param config The config that should be used.
|
|
38
|
+
* @param relaxOrigin Whether to relax the origin of the VM.
|
|
37
39
|
*/
|
|
38
|
-
constructor(id, config) {
|
|
40
|
+
constructor(id, config, relaxOrigin = false) {
|
|
39
41
|
this._id = id;
|
|
40
42
|
this._config = config;
|
|
43
|
+
this._relaxOrigin = relaxOrigin;
|
|
41
44
|
this._localEvents = new Subject();
|
|
42
45
|
this._deviceEvents = new Subject();
|
|
43
46
|
this._stateUpdated = new Subject();
|
|
@@ -74,7 +77,12 @@ export class AuxVMImpl {
|
|
|
74
77
|
}
|
|
75
78
|
_init() {
|
|
76
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
77
|
-
|
|
80
|
+
let origin = getVMOrigin(this._config.config.vmOrigin, location.origin, this._id);
|
|
81
|
+
if (this._relaxOrigin) {
|
|
82
|
+
const baseOrigin = getBaseOrigin(origin);
|
|
83
|
+
console.log('[AuxVMImpl] Relaxing origin to:', baseOrigin);
|
|
84
|
+
origin = baseOrigin;
|
|
85
|
+
}
|
|
78
86
|
const iframeUrl = new URL('/aux-vm-iframe.html', origin).href;
|
|
79
87
|
this._connectionStateChanged.next({
|
|
80
88
|
type: 'progress',
|
package/vm/AuxVMImpl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,wBAAwB,GAI3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAU,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAWhF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAEH,oBAAoB,GAGvB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Gets the origin for the VM.
|
|
3
|
+
* @param configuredOrigin The origin that was configured.
|
|
4
|
+
* @param defaultOrigin The default that should be used if the configured origin is not set.
|
|
5
|
+
* @param instId The ID of the inst.
|
|
6
|
+
*/
|
|
7
|
+
export declare function getVMOrigin(configuredOrigin: string | null, defaultOrigin: string, instId: string): string;
|
|
8
|
+
/**
|
|
9
|
+
* Gets the base domain of the given origin. That is, the hostname but with all subdomains removed.
|
|
10
|
+
* @param origin The origin that should be used.
|
|
11
|
+
*/
|
|
12
|
+
export declare function getBaseOrigin(origin: string): string;
|
|
13
|
+
//# sourceMappingURL=AuxVMUtils.d.ts.map
|
package/vm/AuxVMUtils.js
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Gets the origin for the VM.
|
|
3
|
+
* @param configuredOrigin The origin that was configured.
|
|
4
|
+
* @param defaultOrigin The default that should be used if the configured origin is not set.
|
|
5
|
+
* @param instId The ID of the inst.
|
|
6
|
+
*/
|
|
7
|
+
export function getVMOrigin(configuredOrigin, defaultOrigin, instId) {
|
|
8
|
+
if (!configuredOrigin) {
|
|
9
|
+
return defaultOrigin;
|
|
10
|
+
}
|
|
11
|
+
let indexOfBraces = configuredOrigin.indexOf('{{');
|
|
12
|
+
if (indexOfBraces >= 0) {
|
|
13
|
+
let endOfBraces = configuredOrigin.indexOf('}}', indexOfBraces);
|
|
14
|
+
if (endOfBraces >= 0 &&
|
|
15
|
+
configuredOrigin.substring(indexOfBraces + 2, endOfBraces) ===
|
|
16
|
+
'inst') {
|
|
17
|
+
instId = instId.replace(/[^a-zA-Z0-9]/g, '-');
|
|
18
|
+
return (configuredOrigin.substring(0, indexOfBraces) +
|
|
19
|
+
instId +
|
|
20
|
+
configuredOrigin.substring(endOfBraces + 2));
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return configuredOrigin;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Gets the base domain of the given origin. That is, the hostname but with all subdomains removed.
|
|
27
|
+
* @param origin The origin that should be used.
|
|
28
|
+
*/
|
|
29
|
+
export function getBaseOrigin(origin) {
|
|
30
|
+
try {
|
|
31
|
+
let url = new URL(origin);
|
|
32
|
+
let parts = url.hostname.split('.');
|
|
33
|
+
if (parts.length < 3) {
|
|
34
|
+
return url.origin;
|
|
35
|
+
}
|
|
36
|
+
url.hostname = parts.slice(1).join('.');
|
|
37
|
+
return url.origin;
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
console.warn('[AuxVMUtils] Could not parse origin:', origin, err);
|
|
41
|
+
return origin;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=AuxVMUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuxVMUtils.js","sourceRoot":"","sources":["AuxVMUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACvB,gBAA+B,EAC/B,aAAqB,EACrB,MAAc;IAEd,IAAI,CAAC,gBAAgB,EAAE;QACnB,OAAO,aAAa,CAAC;KACxB;IAED,IAAI,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,aAAa,IAAI,CAAC,EAAE;QACpB,IAAI,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAChE,IACI,WAAW,IAAI,CAAC;YAChB,gBAAgB,CAAC,SAAS,CAAC,aAAa,GAAG,CAAC,EAAE,WAAW,CAAC;gBACtD,MAAM,EACZ;YACE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAC9C,OAAO,CACH,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC;gBAC5C,MAAM;gBACN,gBAAgB,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC,CAC9C,CAAC;SACL;KACJ;IAED,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,IAAI;QACA,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC;SACrB;QACD,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,OAAO,GAAG,CAAC,MAAM,CAAC;KACrB;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;KACjB;AACL,CAAC"}
|