@gitpod/gitpod-protocol 0.1.5-mp-docs-wsp-phase.0 → 0.1.5-mp-fmt-protocol.0
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/lib/accounting-protocol.d.ts +10 -10
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +22 -31
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts.map +1 -1
- package/lib/analytics.js.map +1 -1
- package/lib/auth.d.ts.map +1 -1
- package/lib/context-url.d.ts.map +1 -1
- package/lib/context-url.js +3 -3
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.d.ts.map +1 -1
- package/lib/context-url.spec.js +20 -5
- package/lib/context-url.spec.js.map +1 -1
- package/lib/email-protocol.d.ts +1 -1
- package/lib/email-protocol.d.ts.map +1 -1
- package/lib/email-protocol.js.map +1 -1
- package/lib/encryption/container-module.d.ts.map +1 -1
- package/lib/encryption/container-module.js +1 -1
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.js +7 -7
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +2 -3
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.d.ts.map +1 -1
- package/lib/encryption/encryption-service.js +1 -1
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.d.ts.map +1 -1
- package/lib/encryption/key-provider.js +7 -9
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +1 -1
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +5 -5
- package/lib/env.js.map +1 -1
- package/lib/gitpod-file-parser.d.ts.map +1 -1
- package/lib/gitpod-file-parser.js +6 -6
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.js +42 -39
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +16 -16
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +21 -24
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +1 -1
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/ide-frontend-service.d.ts +1 -1
- package/lib/ide-protocol.d.ts +6 -6
- package/lib/ide-protocol.d.ts.map +1 -1
- package/lib/index.d.ts +16 -16
- package/lib/installation-admin-protocol.d.ts.map +1 -1
- package/lib/installation-admin-protocol.js +2 -2
- package/lib/installation-admin-protocol.js.map +1 -1
- package/lib/license-protocol.d.ts.map +1 -1
- package/lib/license-protocol.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +1 -1
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +19 -19
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.d.ts +4 -4
- package/lib/messaging/browser/window-connection.d.ts.map +1 -1
- package/lib/messaging/browser/window-connection.js +9 -6
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +2 -2
- package/lib/messaging/client-call-metrics.d.ts.map +1 -1
- package/lib/messaging/client-call-metrics.js +20 -20
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/handler.js +1 -1
- package/lib/messaging/node/connection.js +8 -8
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +7 -9
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/payment-protocol.d.ts.map +1 -1
- package/lib/payment-protocol.js +1 -1
- package/lib/payment-protocol.js.map +1 -1
- package/lib/permission.d.ts +2 -2
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +12 -23
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +3 -3
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +206 -171
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +10 -10
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +54 -88
- package/lib/protocol.js.map +1 -1
- package/lib/snapshot-url.spec.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +3 -3
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +4 -4
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +3 -3
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +1 -1
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/typings/globals.d.ts +2 -2
- package/lib/typings/globals.d.ts.map +1 -1
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +6 -6
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.d.ts.map +1 -1
- package/lib/util/async-iterator.js +3 -3
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.js +6 -6
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.d.ts.map +1 -1
- package/lib/util/disposable.js +2 -2
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.d.ts.map +1 -1
- package/lib/util/event.js +5 -3
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +1 -1
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +435 -435
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.js +10 -6
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +1 -1
- package/lib/util/gitpod-cookie.d.ts.map +1 -1
- package/lib/util/gitpod-cookie.js +0 -3
- package/lib/util/gitpod-cookie.js.map +1 -1
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +31 -29
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +15 -5
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts.map +1 -1
- package/lib/util/grpc.js.map +1 -1
- package/lib/util/jaeger-client-types.d.ts.map +1 -1
- package/lib/util/logging.d.ts +1 -1
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +22 -23
- package/lib/util/logging.js.map +1 -1
- package/lib/util/make-link.js +5 -5
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +1 -2
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.spec.js +9 -6
- package/lib/util/queue.spec.js.map +1 -1
- package/lib/util/semaphore.d.ts.map +1 -1
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.d.ts.map +1 -1
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +2 -2
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.d.ts.map +1 -1
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +6 -6
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +6 -6
- package/lib/util/tracing.js.map +1 -1
- package/lib/util/tracing.spec.js +3 -3
- package/lib/util/tracing.spec.js.map +1 -1
- package/lib/util/workspace-port-authentication.d.ts +7 -7
- package/lib/util/workspace-port-authentication.d.ts.map +1 -1
- package/lib/util/workspace-port-authentication.js +8 -11
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/workspace-cluster.d.ts +1 -1
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +2 -4
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/wsready.d.ts.map +1 -1
- package/package.json +1 -1
- package/pkg-yarn.lock +1 -1
- package/provenance-bundle.jsonl +1 -1
- package/src/accounting-protocol.ts +53 -51
- package/src/admin-protocol.ts +22 -20
- package/src/analytics.ts +21 -21
- package/src/auth.ts +2 -2
- package/src/context-url.spec.ts +25 -11
- package/src/context-url.ts +80 -78
- package/src/email-protocol.ts +5 -6
- package/src/encryption/container-module.ts +2 -3
- package/src/encryption/encryption-engine.spec.ts +9 -8
- package/src/encryption/encryption-engine.ts +14 -14
- package/src/encryption/encryption-service.ts +4 -5
- package/src/encryption/key-provider.ts +16 -19
- package/src/env.ts +9 -9
- package/src/gitpod-file-parser.spec.ts +55 -61
- package/src/gitpod-file-parser.ts +16 -17
- package/src/gitpod-service.ts +117 -92
- package/src/headless-workspace-log.ts +5 -4
- package/src/ide-frontend-service.ts +2 -2
- package/src/ide-protocol.ts +8 -8
- package/src/index.ts +16 -16
- package/src/installation-admin-protocol.ts +8 -8
- package/src/license-protocol.ts +5 -6
- package/src/messaging/browser/connection.ts +45 -47
- package/src/messaging/browser/window-connection.ts +39 -29
- package/src/messaging/client-call-metrics.ts +70 -71
- package/src/messaging/error.ts +1 -3
- package/src/messaging/handler.ts +6 -6
- package/src/messaging/node/connection.ts +8 -8
- package/src/messaging/proxy-factory.ts +23 -30
- package/src/oss-allowlist.ts +3 -3
- package/src/payment-protocol.ts +2 -2
- package/src/permission.ts +20 -31
- package/src/plans.ts +236 -189
- package/src/protocol.ts +174 -210
- package/src/snapshot-url.spec.ts +9 -7
- package/src/team-subscription-protocol.ts +31 -23
- package/src/teams-projects-protocol.ts +8 -8
- package/src/typings/globals.ts +4 -4
- package/src/util/analytics.ts +46 -42
- package/src/util/async-iterator.ts +4 -5
- package/src/util/cancelable.ts +3 -3
- package/src/util/date-time.ts +8 -8
- package/src/util/deferred.ts +6 -6
- package/src/util/disposable.ts +3 -6
- package/src/util/event.ts +9 -11
- package/src/util/garbage-collected-cache.ts +3 -6
- package/src/util/generate-workspace-id.spec.ts +18 -15
- package/src/util/generate-workspace-id.ts +453 -453
- package/src/util/gitpod-cookie.ts +8 -9
- package/src/util/gitpod-host-url.spec.ts +40 -13
- package/src/util/gitpod-host-url.ts +37 -34
- package/src/util/grpc.ts +1 -1
- package/src/util/jaeger-client-types.ts +2 -2
- package/src/util/logging.ts +49 -39
- package/src/util/make-link.ts +6 -7
- package/src/util/parse-workspace-id.spec.ts +17 -8
- package/src/util/parse-workspace-id.ts +5 -6
- package/src/util/queue.spec.ts +27 -25
- package/src/util/repeat.ts +1 -1
- package/src/util/semaphore.ts +4 -6
- package/src/util/skip-if.ts +9 -6
- package/src/util/timeutil.spec.ts +14 -15
- package/src/util/timeutil.ts +15 -11
- package/src/util/tracing.spec.ts +28 -23
- package/src/util/tracing.ts +46 -41
- package/src/util/workspace-port-authentication.ts +10 -13
- package/src/workspace-cluster.ts +15 -12
- package/src/wsready.ts +1 -1
package/src/analytics.ts
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
8
7
|
export const IAnalyticsWriter = Symbol("IAnalyticsWriter");
|
|
9
8
|
|
|
10
9
|
type Identity =
|
|
@@ -15,24 +14,27 @@ interface Message {
|
|
|
15
14
|
messageId?: string;
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
export type IdentifyMessage = Message &
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
17
|
+
export type IdentifyMessage = Message &
|
|
18
|
+
Identity & {
|
|
19
|
+
traits?: any;
|
|
20
|
+
timestamp?: Date;
|
|
21
|
+
context?: any;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export type TrackMessage = Message &
|
|
25
|
+
Identity & {
|
|
26
|
+
event: string;
|
|
27
|
+
properties?: any;
|
|
28
|
+
timestamp?: Date;
|
|
29
|
+
context?: any;
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
export type PageMessage = Message &
|
|
33
|
+
Identity & {
|
|
34
|
+
properties?: any;
|
|
35
|
+
timestamp?: Date;
|
|
36
|
+
context?: any;
|
|
37
|
+
};
|
|
36
38
|
|
|
37
39
|
export type RemoteTrackMessage = Omit<TrackMessage, "timestamp" | "userId">;
|
|
38
40
|
export type RemotePageMessage = Omit<PageMessage, "timestamp" | "userId"> & {
|
|
@@ -42,11 +44,9 @@ export type RemotePageMessage = Omit<PageMessage, "timestamp" | "userId"> & {
|
|
|
42
44
|
export type RemoteIdentifyMessage = Omit<IdentifyMessage, "timestamp" | "userId">;
|
|
43
45
|
|
|
44
46
|
export interface IAnalyticsWriter {
|
|
45
|
-
|
|
46
47
|
identify(msg: IdentifyMessage): void;
|
|
47
48
|
|
|
48
49
|
track(msg: TrackMessage): void;
|
|
49
50
|
|
|
50
51
|
page(msg: PageMessage): void;
|
|
51
|
-
|
|
52
52
|
}
|
package/src/auth.ts
CHANGED
|
@@ -11,14 +11,14 @@ export interface SelectAccountPayload {
|
|
|
11
11
|
authHost: string;
|
|
12
12
|
authName: string;
|
|
13
13
|
authProviderType: string;
|
|
14
|
-
}
|
|
14
|
+
};
|
|
15
15
|
otherUser: {
|
|
16
16
|
name: string;
|
|
17
17
|
avatarUrl: string;
|
|
18
18
|
authHost: string;
|
|
19
19
|
authName: string;
|
|
20
20
|
authProviderType: string;
|
|
21
|
-
}
|
|
21
|
+
};
|
|
22
22
|
}
|
|
23
23
|
export namespace SelectAccountPayload {
|
|
24
24
|
export function is(data: any): data is SelectAccountPayload {
|
package/src/context-url.spec.ts
CHANGED
|
@@ -4,43 +4,57 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as chai from
|
|
8
|
-
import { suite, test } from
|
|
9
|
-
import { Workspace } from
|
|
10
|
-
import { ContextURL } from
|
|
7
|
+
import * as chai from "chai";
|
|
8
|
+
import { suite, test } from "mocha-typescript";
|
|
9
|
+
import { Workspace } from ".";
|
|
10
|
+
import { ContextURL } from "./context-url";
|
|
11
11
|
const expect = chai.expect;
|
|
12
12
|
|
|
13
13
|
type WsContextUrl = Pick<Workspace, "context" | "contextURL">;
|
|
14
14
|
|
|
15
15
|
@suite
|
|
16
16
|
export class ContextUrlTest {
|
|
17
|
-
|
|
18
17
|
@test public parseContextUrl_withEnvVar() {
|
|
19
|
-
const actual = ContextURL.getNormalizedURL({
|
|
18
|
+
const actual = ContextURL.getNormalizedURL({
|
|
19
|
+
contextURL: "passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo",
|
|
20
|
+
context: {},
|
|
21
|
+
} as WsContextUrl);
|
|
20
22
|
expect(actual?.host).to.equal("github.com");
|
|
21
23
|
expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
22
24
|
}
|
|
23
25
|
|
|
24
26
|
@test public parseContextUrl_withEnvVar_withoutSchema() {
|
|
25
|
-
const actual = ContextURL.getNormalizedURL({
|
|
27
|
+
const actual = ContextURL.getNormalizedURL({
|
|
28
|
+
contextURL: "passedin=test%20value/github.com/gitpod-io/gitpod-test-repo",
|
|
29
|
+
context: {},
|
|
30
|
+
} as WsContextUrl);
|
|
26
31
|
expect(actual?.host).to.equal("github.com");
|
|
27
32
|
expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
28
33
|
}
|
|
29
34
|
|
|
30
35
|
@test public parseContextUrl_withEnvVar_sshUrl() {
|
|
31
|
-
const actual = ContextURL.getNormalizedURL({
|
|
36
|
+
const actual = ContextURL.getNormalizedURL({
|
|
37
|
+
contextURL: "passedin=test%20value/git@github.com:gitpod-io/gitpod-test-repo.git",
|
|
38
|
+
context: {},
|
|
39
|
+
} as WsContextUrl);
|
|
32
40
|
expect(actual?.host).to.equal("github.com");
|
|
33
41
|
expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo.git");
|
|
34
42
|
}
|
|
35
43
|
|
|
36
44
|
@test public parseContextUrl_withPrebuild() {
|
|
37
|
-
const actual = ContextURL.getNormalizedURL({
|
|
45
|
+
const actual = ContextURL.getNormalizedURL({
|
|
46
|
+
contextURL: "prebuild/https://github.com/gitpod-io/gitpod-test-repo",
|
|
47
|
+
context: {},
|
|
48
|
+
} as WsContextUrl);
|
|
38
49
|
expect(actual?.host).to.equal("github.com");
|
|
39
50
|
expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
40
51
|
}
|
|
41
52
|
|
|
42
53
|
@test public parseContextUrl_withPrebuild_withoutSchema() {
|
|
43
|
-
const actual = ContextURL.getNormalizedURL({
|
|
54
|
+
const actual = ContextURL.getNormalizedURL({
|
|
55
|
+
contextURL: "prebuild/github.com/gitpod-io/gitpod-test-repo",
|
|
56
|
+
context: {},
|
|
57
|
+
} as WsContextUrl);
|
|
44
58
|
expect(actual?.host).to.equal("github.com");
|
|
45
59
|
expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
46
60
|
}
|
|
@@ -50,4 +64,4 @@ export class ContextUrlTest {
|
|
|
50
64
|
expect(actual).to.be.undefined;
|
|
51
65
|
}
|
|
52
66
|
}
|
|
53
|
-
module.exports = new ContextUrlTest()
|
|
67
|
+
module.exports = new ContextUrlTest();
|
package/src/context-url.ts
CHANGED
|
@@ -15,93 +15,95 @@ import { Workspace } from ".";
|
|
|
15
15
|
* TODO(gpl) See if we can get this into `server` code to remove the burden from clients
|
|
16
16
|
*/
|
|
17
17
|
export namespace ContextURL {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
export const INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
|
|
19
|
+
export const PREBUILD_PREFIX = "prebuild";
|
|
20
|
+
export const IMAGEBUILD_PREFIX = "imagebuild";
|
|
21
|
+
export const SNAPSHOT_PREFIX = "snapshot";
|
|
22
|
+
export const REFERRER_PREFIX = "referrer:";
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
24
|
+
/**
|
|
25
|
+
* This function will (try to) return the HTTP(S) URL of the context the user originally created this workspace on.
|
|
26
|
+
* Especially it will not contain any modifiers or be of different scheme than HTTP(S).
|
|
27
|
+
*
|
|
28
|
+
* Use this function if you need to provided a _working_ URL to the original context.
|
|
29
|
+
* @param ws
|
|
30
|
+
* @returns
|
|
31
|
+
*/
|
|
32
|
+
export function getNormalizedURL(ws: Pick<Workspace, "context" | "contextURL"> | undefined): URL | undefined {
|
|
33
|
+
const normalized = normalize(ws);
|
|
34
|
+
if (!normalized) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
try {
|
|
39
|
+
return new URL(normalized);
|
|
40
|
+
} catch (err) {
|
|
41
|
+
console.error(`unable to parse URL from normalized contextURL: '${normalized}'`, err);
|
|
42
|
+
}
|
|
43
|
+
return undefined;
|
|
42
44
|
}
|
|
43
|
-
return undefined;
|
|
44
|
-
}
|
|
45
45
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
46
|
+
function normalize(ws: Pick<Workspace, "context" | "contextURL"> | undefined): string | undefined {
|
|
47
|
+
if (!ws) {
|
|
48
|
+
return undefined;
|
|
49
|
+
}
|
|
50
|
+
if (ws.context.normalizedContextURL) {
|
|
51
|
+
return ws.context.normalizedContextURL;
|
|
52
|
+
}
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
54
|
+
// fallback: we do not yet set normalizedContextURL on all workspaces, yet, let alone older existing workspaces
|
|
55
|
+
let fallback: string | undefined = undefined;
|
|
56
|
+
try {
|
|
57
|
+
fallback = removePrefixes(ws.contextURL);
|
|
58
|
+
} catch (err) {
|
|
59
|
+
console.error(`unable to remove prefixes from contextURL: '${ws.contextURL}'`, err);
|
|
60
|
+
}
|
|
61
|
+
return fallback;
|
|
60
62
|
}
|
|
61
|
-
return fallback;
|
|
62
|
-
}
|
|
63
63
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
64
|
+
/**
|
|
65
|
+
* The field "contextUrl" might contain prefixes like:
|
|
66
|
+
* - envvar1=value1/...
|
|
67
|
+
* - prebuild/...
|
|
68
|
+
* This is the analogon to the (Prefix)ContextParser structure in "server".
|
|
69
|
+
*/
|
|
70
|
+
function removePrefixes(contextUrl: string | undefined): string | undefined {
|
|
71
|
+
if (contextUrl === undefined) {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
74
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
const segments = contextUrl.split("/");
|
|
76
|
+
if (segments.length === 1) {
|
|
77
|
+
return segments[0]; // this might be something, we just try
|
|
78
|
+
}
|
|
79
79
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
80
|
+
const segmentsToURL = (offset: number): string => {
|
|
81
|
+
let rest = segments.slice(offset).join("/");
|
|
82
|
+
if (/^git@[^:\/]+:/.test(rest)) {
|
|
83
|
+
rest = rest.replace(/^git@([^:\/]+):/, "https://$1/");
|
|
84
|
+
}
|
|
85
|
+
if (!rest.startsWith("http")) {
|
|
86
|
+
rest = "https://" + rest;
|
|
87
|
+
}
|
|
88
|
+
return rest;
|
|
89
|
+
};
|
|
90
90
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
91
|
+
const firstSegment = segments[0];
|
|
92
|
+
if (
|
|
93
|
+
firstSegment === PREBUILD_PREFIX ||
|
|
94
|
+
firstSegment === INCREMENTAL_PREBUILD_PREFIX ||
|
|
95
|
+
firstSegment === IMAGEBUILD_PREFIX ||
|
|
96
|
+
firstSegment === SNAPSHOT_PREFIX ||
|
|
97
|
+
firstSegment.startsWith(REFERRER_PREFIX)
|
|
98
|
+
) {
|
|
99
|
+
return segmentsToURL(1);
|
|
100
|
+
}
|
|
99
101
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
// check for env vars
|
|
103
|
+
if (firstSegment.indexOf("=") !== -1) {
|
|
104
|
+
return segmentsToURL(1);
|
|
105
|
+
}
|
|
104
106
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
107
|
+
return segmentsToURL(0);
|
|
108
|
+
}
|
|
109
|
+
}
|
package/src/email-protocol.ts
CHANGED
|
@@ -4,10 +4,9 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { v4 as uuidv4 } from
|
|
7
|
+
import { v4 as uuidv4 } from "uuid";
|
|
8
8
|
|
|
9
|
-
export type EMailState = "scheduledInternal"
|
|
10
|
-
| "scheduledSendgrid";
|
|
9
|
+
export type EMailState = "scheduledInternal" | "scheduledSendgrid";
|
|
11
10
|
|
|
12
11
|
export interface EMailStatus {
|
|
13
12
|
/** The time the email entry was inserted into the DB */
|
|
@@ -58,9 +57,9 @@ export type EMail = {
|
|
|
58
57
|
} & EMailStatus;
|
|
59
58
|
|
|
60
59
|
export namespace EMail {
|
|
61
|
-
export const create = (ts: Omit<EMail,
|
|
60
|
+
export const create = (ts: Omit<EMail, "uid">): EMail => {
|
|
62
61
|
const withId = ts as EMail;
|
|
63
62
|
withId.uid = uuidv4();
|
|
64
63
|
return withId;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
64
|
+
};
|
|
65
|
+
}
|
|
@@ -19,10 +19,9 @@ import { EncryptionService, EncryptionServiceImpl } from "./encryption-service";
|
|
|
19
19
|
* };
|
|
20
20
|
* }).inSingletonScope();
|
|
21
21
|
*/
|
|
22
|
-
export const encryptionModule: interfaces.ContainerModuleCallBack = bind => {
|
|
23
|
-
|
|
22
|
+
export const encryptionModule: interfaces.ContainerModuleCallBack = (bind) => {
|
|
24
23
|
bind(KeyProvider).to(KeyProviderImpl).inSingletonScope();
|
|
25
24
|
|
|
26
25
|
bind(EncryptionEngine).to(EncryptionEngineImpl).inSingletonScope();
|
|
27
26
|
bind(EncryptionService).to(EncryptionServiceImpl).inSingletonScope();
|
|
28
|
-
};
|
|
27
|
+
};
|
|
@@ -5,25 +5,26 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { suite, test } from "mocha-typescript";
|
|
8
|
-
import * as chai from
|
|
9
|
-
import * as path from
|
|
8
|
+
import * as chai from "chai";
|
|
9
|
+
import * as path from "path";
|
|
10
10
|
import * as fs from "fs";
|
|
11
11
|
|
|
12
12
|
import { EncryptionEngineImpl } from "./encryption-engine";
|
|
13
13
|
|
|
14
14
|
const expect = chai.expect;
|
|
15
15
|
|
|
16
|
-
@suite
|
|
16
|
+
@suite
|
|
17
|
+
class TestEncryptionEngineImpl {
|
|
17
18
|
// Created with openssl rand -rand /dev/urandom -out key -base64 32
|
|
18
|
-
protected get testkey
|
|
19
|
-
const keyFilePath = path.resolve(__dirname,
|
|
19
|
+
protected get testkey() {
|
|
20
|
+
const keyFilePath = path.resolve(__dirname, "../../test/fixtures/encryption/testkey");
|
|
20
21
|
const keyBuffer = fs.readFileSync(keyFilePath);
|
|
21
22
|
return keyBuffer.toString().trim();
|
|
22
|
-
}
|
|
23
|
+
}
|
|
23
24
|
|
|
24
25
|
@test basicSymmetry() {
|
|
25
26
|
const plaintext = "12345678901234567890";
|
|
26
|
-
const key = new Buffer(this.testkey,
|
|
27
|
+
const key = new Buffer(this.testkey, "base64");
|
|
27
28
|
|
|
28
29
|
const cut = new EncryptionEngineImpl();
|
|
29
30
|
const encryptedData = cut.encrypt(plaintext, key);
|
|
@@ -33,4 +34,4 @@ const expect = chai.expect;
|
|
|
33
34
|
expect(decryptedPlaintext).equals(plaintext);
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
|
-
export const t = new TestEncryptionEngineImpl();
|
|
37
|
+
export const t = new TestEncryptionEngineImpl();
|
|
@@ -4,20 +4,20 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as crypto from
|
|
8
|
-
import { injectable } from
|
|
7
|
+
import * as crypto from "crypto";
|
|
8
|
+
import { injectable } from "inversify";
|
|
9
9
|
|
|
10
10
|
export interface KeyParams {
|
|
11
|
-
iv: string
|
|
11
|
+
iv: string;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
export interface EncryptedData {
|
|
15
15
|
/** utf8 encoded string */
|
|
16
|
-
data: string
|
|
17
|
-
keyParams: KeyParams
|
|
16
|
+
data: string;
|
|
17
|
+
keyParams: KeyParams;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
export const EncryptionEngine = Symbol(
|
|
20
|
+
export const EncryptionEngine = Symbol("EncryptionEngine");
|
|
21
21
|
export interface EncryptionEngine {
|
|
22
22
|
/**
|
|
23
23
|
* @param data utf8 encoded string
|
|
@@ -32,21 +32,21 @@ export interface EncryptionEngine {
|
|
|
32
32
|
* - no salt, as we pass in a real key (no salting needed to turn a password into a key)
|
|
33
33
|
* The implementation closely follows the exampes in https://nodejs.org/api/crypto.html.
|
|
34
34
|
*/
|
|
35
|
-
|
|
35
|
+
@injectable()
|
|
36
36
|
export class EncryptionEngineImpl {
|
|
37
|
-
readonly algorithm =
|
|
38
|
-
readonly enc =
|
|
37
|
+
readonly algorithm = "aes-256-cbc";
|
|
38
|
+
readonly enc = "base64";
|
|
39
39
|
|
|
40
40
|
encrypt(data: string, key: Buffer): EncryptedData {
|
|
41
41
|
const iv = crypto.randomBytes(16);
|
|
42
42
|
const cipher = crypto.createCipheriv(this.algorithm, key, iv);
|
|
43
|
-
const encrypted = cipher.update(new Buffer(data,
|
|
43
|
+
const encrypted = cipher.update(new Buffer(data, "utf8"));
|
|
44
44
|
const finalEncrypted = Buffer.concat([encrypted, cipher.final()]);
|
|
45
45
|
return {
|
|
46
46
|
data: finalEncrypted.toString(this.enc),
|
|
47
47
|
keyParams: {
|
|
48
|
-
iv: iv.toString(this.enc)
|
|
49
|
-
}
|
|
48
|
+
iv: iv.toString(this.enc),
|
|
49
|
+
},
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
|
|
@@ -54,6 +54,6 @@ export class EncryptionEngineImpl {
|
|
|
54
54
|
const decipher = crypto.createDecipheriv(this.algorithm, key, new Buffer(encryptedData.keyParams.iv, this.enc));
|
|
55
55
|
let decrypted = decipher.update(new Buffer(encryptedData.data, this.enc));
|
|
56
56
|
const finalDecrypted = Buffer.concat([decrypted, decipher.final()]);
|
|
57
|
-
return finalDecrypted.toString(
|
|
57
|
+
return finalDecrypted.toString("utf8");
|
|
58
58
|
}
|
|
59
|
-
}
|
|
59
|
+
}
|
|
@@ -9,12 +9,11 @@ import { injectable, inject } from "inversify";
|
|
|
9
9
|
import { EncryptedData, EncryptionEngine } from "./encryption-engine";
|
|
10
10
|
import { KeyProvider, KeyMetadata } from "./key-provider";
|
|
11
11
|
|
|
12
|
-
|
|
13
12
|
export interface Encrypted<_T> extends EncryptedData {
|
|
14
|
-
keyMetadata: KeyMetadata
|
|
13
|
+
keyMetadata: KeyMetadata;
|
|
15
14
|
}
|
|
16
15
|
|
|
17
|
-
export const EncryptionService = Symbol(
|
|
16
|
+
export const EncryptionService = Symbol("EncryptionService");
|
|
18
17
|
export interface EncryptionService {
|
|
19
18
|
encrypt<T>(data: T): Encrypted<T>;
|
|
20
19
|
decrypt<T>(encrypted: Encrypted<T>): T;
|
|
@@ -32,7 +31,7 @@ export class EncryptionServiceImpl implements EncryptionService {
|
|
|
32
31
|
const encryptedData = this.engine.encrypt(dataStr, key.material);
|
|
33
32
|
return {
|
|
34
33
|
...encryptedData,
|
|
35
|
-
keyMetadata: key.metadata
|
|
34
|
+
keyMetadata: key.metadata,
|
|
36
35
|
};
|
|
37
36
|
}
|
|
38
37
|
|
|
@@ -49,4 +48,4 @@ export class EncryptionServiceImpl implements EncryptionService {
|
|
|
49
48
|
protected deserialize<T>(data: string): T {
|
|
50
49
|
return JSON.parse(data) as T;
|
|
51
50
|
}
|
|
52
|
-
}
|
|
51
|
+
}
|
|
@@ -7,16 +7,16 @@
|
|
|
7
7
|
import { injectable, inject } from "inversify";
|
|
8
8
|
|
|
9
9
|
export interface KeyMetadata {
|
|
10
|
-
name: string
|
|
11
|
-
version: number
|
|
10
|
+
name: string;
|
|
11
|
+
version: number;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
export interface Key {
|
|
15
|
-
metadata: KeyMetadata
|
|
16
|
-
material: Buffer
|
|
15
|
+
metadata: KeyMetadata;
|
|
16
|
+
material: Buffer;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
export const KeyProvider = Symbol(
|
|
19
|
+
export const KeyProvider = Symbol("KeyProvider");
|
|
20
20
|
export interface KeyProvider {
|
|
21
21
|
getPrimaryKey(): Key;
|
|
22
22
|
getKeyFor(metadata: KeyMetadata): Key;
|
|
@@ -24,24 +24,21 @@ export interface KeyProvider {
|
|
|
24
24
|
|
|
25
25
|
export type KeyConfig = KeyMetadata & {
|
|
26
26
|
/** base64 encoded */
|
|
27
|
-
material: string
|
|
28
|
-
primary?: boolean
|
|
29
|
-
}
|
|
27
|
+
material: string;
|
|
28
|
+
primary?: boolean;
|
|
29
|
+
};
|
|
30
30
|
|
|
31
|
-
export const KeyProviderConfig = Symbol(
|
|
31
|
+
export const KeyProviderConfig = Symbol("KeyProviderConfig");
|
|
32
32
|
export interface KeyProviderConfig {
|
|
33
|
-
keys: KeyConfig[]
|
|
33
|
+
keys: KeyConfig[];
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
@injectable()
|
|
37
37
|
export class KeyProviderImpl implements KeyProvider {
|
|
38
|
-
|
|
39
38
|
static loadKeyConfigFromJsonString(configStr: string): KeyConfig[] {
|
|
40
39
|
const keys = (JSON.parse(configStr) || []) as KeyConfig[];
|
|
41
|
-
if (!Array.isArray(keys)
|
|
42
|
-
|
|
43
|
-
|| 1 !== keys.reduce((p, k) => k.primary ? p + 1 : p, 0)) {
|
|
44
|
-
throw new Error('Invalid key config!');
|
|
40
|
+
if (!Array.isArray(keys) || keys.length < 0 || 1 !== keys.reduce((p, k) => (k.primary ? p + 1 : p), 0)) {
|
|
41
|
+
throw new Error("Invalid key config!");
|
|
45
42
|
}
|
|
46
43
|
return keys;
|
|
47
44
|
}
|
|
@@ -49,13 +46,13 @@ export class KeyProviderImpl implements KeyProvider {
|
|
|
49
46
|
constructor(@inject(KeyProviderConfig) protected readonly config: KeyProviderConfig) {}
|
|
50
47
|
|
|
51
48
|
protected get keys() {
|
|
52
|
-
return this.config.keys
|
|
49
|
+
return this.config.keys;
|
|
53
50
|
}
|
|
54
51
|
|
|
55
52
|
getPrimaryKey(): Key {
|
|
56
53
|
const primaryKey = this.keys.find((key) => !!key.primary);
|
|
57
54
|
if (!primaryKey) {
|
|
58
|
-
throw new Error(
|
|
55
|
+
throw new Error("No primary encryption key found!");
|
|
59
56
|
}
|
|
60
57
|
return this.configToKey(primaryKey);
|
|
61
58
|
}
|
|
@@ -72,9 +69,9 @@ export class KeyProviderImpl implements KeyProvider {
|
|
|
72
69
|
return {
|
|
73
70
|
metadata: {
|
|
74
71
|
name: config.name,
|
|
75
|
-
version: config.version
|
|
72
|
+
version: config.version,
|
|
76
73
|
},
|
|
77
|
-
material: new Buffer(config.material,
|
|
74
|
+
material: new Buffer(config.material, "base64"),
|
|
78
75
|
};
|
|
79
76
|
}
|
|
80
77
|
}
|
package/src/env.ts
CHANGED
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
import { injectable } from "inversify";
|
|
8
8
|
|
|
9
9
|
const legacyStagenameTranslation: { [key: string]: KubeStage } = {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
10
|
+
production: "production",
|
|
11
|
+
staging: "prodcopy",
|
|
12
|
+
devstaging: "dev",
|
|
13
|
+
dev: "dev",
|
|
14
|
+
};
|
|
15
15
|
|
|
16
16
|
export function translateLegacyStagename(kubeStage: string): KubeStage {
|
|
17
17
|
const stage = legacyStagenameTranslation[kubeStage];
|
|
@@ -24,13 +24,13 @@ export function translateLegacyStagename(kubeStage: string): KubeStage {
|
|
|
24
24
|
|
|
25
25
|
@injectable()
|
|
26
26
|
export abstract class AbstractComponentEnv {
|
|
27
|
-
readonly kubeStage: KubeStage = getEnvVarParsed(
|
|
27
|
+
readonly kubeStage: KubeStage = getEnvVarParsed("KUBE_STAGE", translateLegacyStagename);
|
|
28
28
|
|
|
29
|
-
readonly installationLongname: string = getEnvVar("GITPOD_INSTALLATION_LONGNAME")
|
|
30
|
-
readonly installationShortname: string = getEnvVar("GITPOD_INSTALLATION_SHORTNAME")
|
|
29
|
+
readonly installationLongname: string = getEnvVar("GITPOD_INSTALLATION_LONGNAME");
|
|
30
|
+
readonly installationShortname: string = getEnvVar("GITPOD_INSTALLATION_SHORTNAME");
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
export type KubeStage =
|
|
33
|
+
export type KubeStage = "production" | "prodcopy" | "staging" | "dev";
|
|
34
34
|
|
|
35
35
|
export function getEnvVar(name: string, defaultValue?: string): string {
|
|
36
36
|
const value = process.env[name] || defaultValue;
|