opal-security 2.0.11 → 2.0.14
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/README.md +56 -31
- package/lib/commands/iam-roles/start.d.ts +1 -0
- package/lib/commands/iam-roles/start.js +22 -3
- package/lib/commands/kube-roles/start.d.ts +1 -0
- package/lib/commands/kube-roles/start.js +22 -3
- package/lib/commands/login.d.ts +1 -0
- package/lib/commands/login.js +18 -6
- package/lib/commands/postgres-instances/start.d.ts +1 -0
- package/lib/commands/postgres-instances/start.js +22 -2
- package/lib/commands/set-token.d.ts +10 -0
- package/lib/commands/set-token.js +58 -0
- package/lib/commands/set-url.d.ts +1 -0
- package/lib/commands/set-url.js +4 -0
- package/lib/commands/ssh/copyFrom.d.ts +1 -0
- package/lib/commands/ssh/copyFrom.js +22 -3
- package/lib/commands/ssh/copyTo.d.ts +1 -0
- package/lib/commands/ssh/copyTo.js +22 -3
- package/lib/commands/ssh/start.d.ts +1 -0
- package/lib/commands/ssh/start.js +28 -3
- package/lib/lib/common.d.ts +2 -0
- package/lib/lib/common.js +13 -0
- package/lib/lib/config.d.ts +1 -0
- package/lib/lib/config.js +10 -1
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -22,7 +22,7 @@ $ npm install -g opal-security
|
|
|
22
22
|
$ opal COMMAND
|
|
23
23
|
running command...
|
|
24
24
|
$ opal (-v|--version|version)
|
|
25
|
-
opal-security/2.0.
|
|
25
|
+
opal-security/2.0.14 darwin-x64 node-v14.16.1
|
|
26
26
|
$ opal --help [COMMAND]
|
|
27
27
|
USAGE
|
|
28
28
|
$ opal COMMAND
|
|
@@ -43,6 +43,7 @@ USAGE
|
|
|
43
43
|
* [`opal logout`](#opal-logout)
|
|
44
44
|
* [`opal postgres-instances:start`](#opal-postgres-instancesstart)
|
|
45
45
|
* [`opal resources:get`](#opal-resourcesget)
|
|
46
|
+
* [`opal set-token`](#opal-set-token)
|
|
46
47
|
* [`opal set-url`](#opal-set-url)
|
|
47
48
|
* [`opal ssh:copyFrom`](#opal-sshcopyfrom)
|
|
48
49
|
* [`opal ssh:copyTo`](#opal-sshcopyto)
|
|
@@ -86,7 +87,7 @@ EXAMPLE
|
|
|
86
87
|
opal aws:identity
|
|
87
88
|
```
|
|
88
89
|
|
|
89
|
-
_See code: [src/commands/aws/identity.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
90
|
+
_See code: [src/commands/aws/identity.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/aws/identity.ts)_
|
|
90
91
|
|
|
91
92
|
## `opal curl-example`
|
|
92
93
|
|
|
@@ -100,7 +101,7 @@ OPTIONS
|
|
|
100
101
|
-h, --help show CLI help
|
|
101
102
|
```
|
|
102
103
|
|
|
103
|
-
_See code: [src/commands/curl-example.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
104
|
+
_See code: [src/commands/curl-example.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/curl-example.ts)_
|
|
104
105
|
|
|
105
106
|
## `opal help [COMMAND]`
|
|
106
107
|
|
|
@@ -128,15 +129,16 @@ USAGE
|
|
|
128
129
|
$ opal iam-roles:start
|
|
129
130
|
|
|
130
131
|
OPTIONS
|
|
131
|
-
-h, --help
|
|
132
|
-
--id=id
|
|
132
|
+
-h, --help show CLI help
|
|
133
|
+
--id=id The ID of the Opal role resource.
|
|
134
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
133
135
|
|
|
134
136
|
EXAMPLES
|
|
135
137
|
opal iam-roles:start
|
|
136
138
|
opal iam-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398
|
|
137
139
|
```
|
|
138
140
|
|
|
139
|
-
_See code: [src/commands/iam-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
141
|
+
_See code: [src/commands/iam-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/iam-roles/start.ts)_
|
|
140
142
|
|
|
141
143
|
## `opal kube-roles:start`
|
|
142
144
|
|
|
@@ -150,6 +152,7 @@ OPTIONS
|
|
|
150
152
|
-h, --help show CLI help
|
|
151
153
|
--accessLevelRemoteId=accessLevelRemoteId The remote ID of the access level with which to access the cluster.
|
|
152
154
|
--id=id The ID of the Opal role resource.
|
|
155
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
153
156
|
|
|
154
157
|
EXAMPLES
|
|
155
158
|
opal kube-roles:start
|
|
@@ -158,7 +161,7 @@ EXAMPLES
|
|
|
158
161
|
"arn:aws:iam::712234975475:role/acme-eks-cluster-admin-role"
|
|
159
162
|
```
|
|
160
163
|
|
|
161
|
-
_See code: [src/commands/kube-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
164
|
+
_See code: [src/commands/kube-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/kube-roles/start.ts)_
|
|
162
165
|
|
|
163
166
|
## `opal login`
|
|
164
167
|
|
|
@@ -175,7 +178,7 @@ EXAMPLE
|
|
|
175
178
|
$ opal login
|
|
176
179
|
```
|
|
177
180
|
|
|
178
|
-
_See code: [src/commands/login.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
181
|
+
_See code: [src/commands/login.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/login.ts)_
|
|
179
182
|
|
|
180
183
|
## `opal logout`
|
|
181
184
|
|
|
@@ -192,7 +195,7 @@ EXAMPLE
|
|
|
192
195
|
$ opal logout
|
|
193
196
|
```
|
|
194
197
|
|
|
195
|
-
_See code: [src/commands/logout.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
198
|
+
_See code: [src/commands/logout.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/logout.ts)_
|
|
196
199
|
|
|
197
200
|
## `opal postgres-instances:start`
|
|
198
201
|
|
|
@@ -206,6 +209,7 @@ OPTIONS
|
|
|
206
209
|
-h, --help show CLI help
|
|
207
210
|
--accessLevelRemoteId=accessLevelRemoteId The remote ID of the access level with which to access the database.
|
|
208
211
|
--id=id The ID of the Opal instance resource.
|
|
212
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
209
213
|
|
|
210
214
|
EXAMPLES
|
|
211
215
|
opal postgres-instances:start
|
|
@@ -213,7 +217,7 @@ EXAMPLES
|
|
|
213
217
|
opal postgres-instances:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --accessLevelRemoteId "fullaccess"
|
|
214
218
|
```
|
|
215
219
|
|
|
216
|
-
_See code: [src/commands/postgres-instances/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
220
|
+
_See code: [src/commands/postgres-instances/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/postgres-instances/start.ts)_
|
|
217
221
|
|
|
218
222
|
## `opal resources:get`
|
|
219
223
|
|
|
@@ -231,7 +235,24 @@ EXAMPLE
|
|
|
231
235
|
opal resources:get --id 54052a3e-5375-4392-aeaf-0c6c44c131d4
|
|
232
236
|
```
|
|
233
237
|
|
|
234
|
-
_See code: [src/commands/resources/get.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
238
|
+
_See code: [src/commands/resources/get.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/resources/get.ts)_
|
|
239
|
+
|
|
240
|
+
## `opal set-token`
|
|
241
|
+
|
|
242
|
+
Sets an API token to authenticate with the Opal server - alternative auth flow for headless environments.
|
|
243
|
+
|
|
244
|
+
```
|
|
245
|
+
USAGE
|
|
246
|
+
$ opal set-token
|
|
247
|
+
|
|
248
|
+
OPTIONS
|
|
249
|
+
-h, --help show CLI help
|
|
250
|
+
|
|
251
|
+
EXAMPLE
|
|
252
|
+
$ opal set-token
|
|
253
|
+
```
|
|
254
|
+
|
|
255
|
+
_See code: [src/commands/set-token.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/set-token.ts)_
|
|
235
256
|
|
|
236
257
|
## `opal set-url`
|
|
237
258
|
|
|
@@ -249,12 +270,13 @@ OPTIONS
|
|
|
249
270
|
--dev
|
|
250
271
|
--devLocal
|
|
251
272
|
--prod
|
|
273
|
+
--staging
|
|
252
274
|
|
|
253
275
|
EXAMPLE
|
|
254
276
|
$ opal set-host
|
|
255
277
|
```
|
|
256
278
|
|
|
257
|
-
_See code: [src/commands/set-url.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
279
|
+
_See code: [src/commands/set-url.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/set-url.ts)_
|
|
258
280
|
|
|
259
281
|
## `opal ssh:copyFrom`
|
|
260
282
|
|
|
@@ -265,22 +287,23 @@ USAGE
|
|
|
265
287
|
$ opal ssh:copyFrom
|
|
266
288
|
|
|
267
289
|
OPTIONS
|
|
268
|
-
-h, --help
|
|
269
|
-
--dest=dest
|
|
270
|
-
--id=id
|
|
290
|
+
-h, --help show CLI help
|
|
291
|
+
--dest=dest [default: .] Pick which directory you want your files to be copied to.
|
|
292
|
+
--id=id The ID of the Opal instance resource.
|
|
293
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
271
294
|
|
|
272
|
-
--src=src
|
|
273
|
-
|
|
295
|
+
--src=src (required) The path of the directory or file you would like to copy over SCP. Note we only
|
|
296
|
+
support one file or directory at a time.
|
|
274
297
|
|
|
275
|
-
--user=user
|
|
276
|
-
|
|
298
|
+
--user=user [default: ssm-user] Pick which user you want to run SCP over. Keep in mind not all users will
|
|
299
|
+
have access to each other's home directory.
|
|
277
300
|
|
|
278
301
|
EXAMPLES
|
|
279
302
|
opal ssh:copyFrom --src instance/dir --dest my/dir
|
|
280
303
|
opal ssh:copyFrom --src instance/dir --dest my/dir --id 51f7176b-0464-4a6f-8369-e951e187b398
|
|
281
304
|
```
|
|
282
305
|
|
|
283
|
-
_See code: [src/commands/ssh/copyFrom.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
306
|
+
_See code: [src/commands/ssh/copyFrom.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/ssh/copyFrom.ts)_
|
|
284
307
|
|
|
285
308
|
## `opal ssh:copyTo`
|
|
286
309
|
|
|
@@ -291,22 +314,23 @@ USAGE
|
|
|
291
314
|
$ opal ssh:copyTo
|
|
292
315
|
|
|
293
316
|
OPTIONS
|
|
294
|
-
-h, --help
|
|
295
|
-
--dest=dest
|
|
296
|
-
--id=id
|
|
317
|
+
-h, --help show CLI help
|
|
318
|
+
--dest=dest [default: .] Pick which directory you want your files to be copied to.
|
|
319
|
+
--id=id The ID of the Opal instance resource.
|
|
320
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
297
321
|
|
|
298
|
-
--src=src
|
|
299
|
-
|
|
322
|
+
--src=src (required) The path of the directory or file you would like to copy over SCP. Note we only
|
|
323
|
+
support one file or directory at a time.
|
|
300
324
|
|
|
301
|
-
--user=user
|
|
302
|
-
|
|
325
|
+
--user=user [default: ssm-user] Pick which user you want to run SCP over. Keep in mind not all users will
|
|
326
|
+
have access to each other's home directory.
|
|
303
327
|
|
|
304
328
|
EXAMPLES
|
|
305
329
|
opal ssh:copyTo --src my/dir --dest instance/dir
|
|
306
330
|
opal ssh:copyTo --src my/dir --dest instance/dir --id 51f7176b-0464-4a6f-8369-e951e187b398
|
|
307
331
|
```
|
|
308
332
|
|
|
309
|
-
_See code: [src/commands/ssh/copyTo.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
333
|
+
_See code: [src/commands/ssh/copyTo.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/ssh/copyTo.ts)_
|
|
310
334
|
|
|
311
335
|
## `opal ssh:start`
|
|
312
336
|
|
|
@@ -317,13 +341,14 @@ USAGE
|
|
|
317
341
|
$ opal ssh:start
|
|
318
342
|
|
|
319
343
|
OPTIONS
|
|
320
|
-
-h, --help
|
|
321
|
-
--id=id
|
|
344
|
+
-h, --help show CLI help
|
|
345
|
+
--id=id The ID of the Opal instance resource.
|
|
346
|
+
--sessionId=sessionId SessionId of a session that has already been created via the web flow.
|
|
322
347
|
|
|
323
348
|
EXAMPLES
|
|
324
349
|
opal ssh:start
|
|
325
350
|
opal ssh:start --id 51f7176b-0464-4a6f-8369-e951e187b398
|
|
326
351
|
```
|
|
327
352
|
|
|
328
|
-
_See code: [src/commands/ssh/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.
|
|
353
|
+
_See code: [src/commands/ssh/start.ts](https://github.com/opalsecurity/opal-cli/blob/v2.0.14/src/commands/ssh/start.ts)_
|
|
329
354
|
<!-- commandsstop -->
|
|
@@ -5,6 +5,7 @@ export default class StartIAMRoleSession extends Command {
|
|
|
5
5
|
static flags: {
|
|
6
6
|
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
7
7
|
id: flags.IOptionFlag<string | undefined>;
|
|
8
|
+
sessionId: flags.IOptionFlag<string | undefined>;
|
|
8
9
|
};
|
|
9
10
|
run(): Promise<void>;
|
|
10
11
|
}
|
|
@@ -8,9 +8,10 @@ const inquirer = require("inquirer");
|
|
|
8
8
|
const aws_1 = require("../../lib/aws");
|
|
9
9
|
const resources_1 = require("../../lib/resources");
|
|
10
10
|
const get_1 = require("../../commands/resources/get");
|
|
11
|
+
const common_1 = require("../../lib/common");
|
|
11
12
|
const StartIAMRoleSessionDocument = `
|
|
12
|
-
mutation StartIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
13
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
13
|
+
mutation StartIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
14
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
14
15
|
__typename
|
|
15
16
|
... on CreateSessionResult {
|
|
16
17
|
session {
|
|
@@ -27,9 +28,18 @@ mutation StartIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessLevel
|
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
}
|
|
31
|
+
... on SessionNotFoundError {
|
|
32
|
+
message
|
|
33
|
+
}
|
|
34
|
+
... on MfaInvalidError {
|
|
35
|
+
message
|
|
36
|
+
}
|
|
30
37
|
... on ResourceNotFoundError {
|
|
31
38
|
message
|
|
32
39
|
}
|
|
40
|
+
... on EndSystemAuthorizationError {
|
|
41
|
+
message
|
|
42
|
+
}
|
|
33
43
|
}
|
|
34
44
|
}`;
|
|
35
45
|
const ListIamRolesDocument = `
|
|
@@ -51,6 +61,7 @@ class StartIAMRoleSession extends command_1.Command {
|
|
|
51
61
|
const { flags } = this.parse(StartIAMRoleSession);
|
|
52
62
|
let roleId = flags.id;
|
|
53
63
|
let roleName = null;
|
|
64
|
+
const sessionId = flags.sessionId;
|
|
54
65
|
if (!roleId) {
|
|
55
66
|
const { resp: iamRolesResp, error } = await handler_1.runQuery({
|
|
56
67
|
command: this,
|
|
@@ -106,7 +117,7 @@ class StartIAMRoleSession extends command_1.Command {
|
|
|
106
117
|
const { resp, error } = await handler_1.runMutation({
|
|
107
118
|
command: this,
|
|
108
119
|
query: StartIAMRoleSessionDocument,
|
|
109
|
-
variables: { id: roleId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL },
|
|
120
|
+
variables: { id: roleId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL, sessionId: sessionId },
|
|
110
121
|
});
|
|
111
122
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
112
123
|
case 'CreateSessionResult': {
|
|
@@ -125,6 +136,10 @@ class StartIAMRoleSession extends command_1.Command {
|
|
|
125
136
|
}
|
|
126
137
|
break;
|
|
127
138
|
}
|
|
139
|
+
case 'MfaInvalidError': {
|
|
140
|
+
common_1.handleMfaRedirect(this, roleId);
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
128
143
|
default:
|
|
129
144
|
apollo_1.printRequestOutput(this, resp, error);
|
|
130
145
|
}
|
|
@@ -142,4 +157,8 @@ StartIAMRoleSession.flags = {
|
|
|
142
157
|
multiple: false,
|
|
143
158
|
description: 'The ID of the Opal role resource.',
|
|
144
159
|
}),
|
|
160
|
+
sessionId: command_1.flags.string({
|
|
161
|
+
multiple: false,
|
|
162
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
163
|
+
}),
|
|
145
164
|
};
|
|
@@ -6,6 +6,7 @@ export default class StartKubeIAMRoleSession extends Command {
|
|
|
6
6
|
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
7
7
|
id: flags.IOptionFlag<string | undefined>;
|
|
8
8
|
accessLevelRemoteId: flags.IOptionFlag<string | undefined>;
|
|
9
|
+
sessionId: flags.IOptionFlag<string | undefined>;
|
|
9
10
|
};
|
|
10
11
|
run(): Promise<void>;
|
|
11
12
|
}
|
|
@@ -8,9 +8,10 @@ const inquirer = require("inquirer");
|
|
|
8
8
|
const types_1 = require("../../types");
|
|
9
9
|
const aws_1 = require("../../lib/aws");
|
|
10
10
|
const resources_1 = require("../../lib/resources");
|
|
11
|
+
const common_1 = require("../../lib/common");
|
|
11
12
|
const StartKubeIAMRoleSessionDocument = `
|
|
12
|
-
mutation StartKubeIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
13
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
13
|
+
mutation StartKubeIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
14
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
14
15
|
__typename
|
|
15
16
|
... on CreateSessionResult {
|
|
16
17
|
session {
|
|
@@ -27,9 +28,18 @@ mutation StartKubeIAMRoleSession($id: ResourceId!, $accessLevel: ResourceAccessL
|
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
}
|
|
31
|
+
... on SessionNotFoundError {
|
|
32
|
+
message
|
|
33
|
+
}
|
|
34
|
+
... on MfaInvalidError {
|
|
35
|
+
message
|
|
36
|
+
}
|
|
30
37
|
... on ResourceNotFoundError {
|
|
31
38
|
message
|
|
32
39
|
}
|
|
40
|
+
... on EndSystemAuthorizationError {
|
|
41
|
+
message
|
|
42
|
+
}
|
|
33
43
|
}
|
|
34
44
|
}`;
|
|
35
45
|
const ListKubeIamRolesDocument = `
|
|
@@ -54,6 +64,7 @@ class StartKubeIAMRoleSession extends command_1.Command {
|
|
|
54
64
|
const { flags } = this.parse(StartKubeIAMRoleSession);
|
|
55
65
|
// TODO: RESOURCES-1: How do we grant access to a perm using ID
|
|
56
66
|
let clusterId = flags.id;
|
|
67
|
+
const sessionId = flags.sessionId;
|
|
57
68
|
if (!clusterId) {
|
|
58
69
|
const { resp: kubeIamRolesResp, error } = await handler_1.runQuery({
|
|
59
70
|
command: this,
|
|
@@ -101,7 +112,7 @@ class StartKubeIAMRoleSession extends command_1.Command {
|
|
|
101
112
|
const { resp, error } = await handler_1.runMutation({
|
|
102
113
|
command: this,
|
|
103
114
|
query: StartKubeIAMRoleSessionDocument,
|
|
104
|
-
variables: { id: clusterId, accessLevel },
|
|
115
|
+
variables: { id: clusterId, accessLevel, sessionId },
|
|
105
116
|
});
|
|
106
117
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
107
118
|
case 'CreateSessionResult': {
|
|
@@ -120,6 +131,10 @@ class StartKubeIAMRoleSession extends command_1.Command {
|
|
|
120
131
|
}
|
|
121
132
|
break;
|
|
122
133
|
}
|
|
134
|
+
case 'MfaInvalidError': {
|
|
135
|
+
common_1.handleMfaRedirect(this, clusterId);
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
123
138
|
default:
|
|
124
139
|
apollo_1.printRequestOutput(this, resp, error);
|
|
125
140
|
}
|
|
@@ -142,4 +157,8 @@ StartKubeIAMRoleSession.flags = {
|
|
|
142
157
|
multiple: false,
|
|
143
158
|
description: 'The remote ID of the access level with which to access the cluster.',
|
|
144
159
|
}),
|
|
160
|
+
sessionId: command_1.flags.string({
|
|
161
|
+
multiple: false,
|
|
162
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
163
|
+
}),
|
|
145
164
|
};
|
package/lib/commands/login.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Command } from '@oclif/command';
|
|
2
|
+
export declare const CLIAuthSessionCheckDocument = "\nquery CLIAuthSessionCheck {\n organizationSettings {\n ... on OrganizationSettingsResult {\n settings {\n id\n }\n }\n }\n}\n";
|
|
2
3
|
export default class Login extends Command {
|
|
3
4
|
static description: string;
|
|
4
5
|
static examples: string[];
|
package/lib/commands/login.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CLIAuthSessionCheckDocument = void 0;
|
|
3
4
|
const command_1 = require("@oclif/command");
|
|
4
5
|
const keytar = require("keytar");
|
|
5
6
|
const open = require("open");
|
|
@@ -10,9 +11,11 @@ const inquirer = require("inquirer");
|
|
|
10
11
|
const handler_1 = require("../handler");
|
|
11
12
|
const credentials_2 = require("../lib/credentials");
|
|
12
13
|
const config_1 = require("../lib/config");
|
|
13
|
-
const
|
|
14
|
+
const ISSUER_PROD = 'https://auth.opal.dev';
|
|
15
|
+
const ISSUER_DEV = 'https://authdev.opal.dev';
|
|
14
16
|
const GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:device_code';
|
|
15
|
-
const
|
|
17
|
+
const CLIENT_ID_PROD = '42rm6E5v7o67LBpRfjdT9KhnjrQHr9UF';
|
|
18
|
+
const CLIENT_ID_DEV = 'XYV8qoAvZG7dHnhRp2g5XMJ1zX9fBP6s';
|
|
16
19
|
const CLISignInMethodDocument = `
|
|
17
20
|
query CLISignInMethod($input: SignInMethodInput!) {
|
|
18
21
|
signInMethod(input: $input) {
|
|
@@ -25,7 +28,7 @@ query CLISignInMethod($input: SignInMethodInput!) {
|
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
}`;
|
|
28
|
-
|
|
31
|
+
exports.CLIAuthSessionCheckDocument = `
|
|
29
32
|
query CLIAuthSessionCheck {
|
|
30
33
|
organizationSettings {
|
|
31
34
|
... on OrganizationSettingsResult {
|
|
@@ -91,10 +94,19 @@ class Login extends command_1.Command {
|
|
|
91
94
|
}
|
|
92
95
|
}
|
|
93
96
|
}
|
|
94
|
-
|
|
97
|
+
let issuer;
|
|
98
|
+
let clientId;
|
|
99
|
+
if (config_1.isProduction(this.config.configDir)) {
|
|
100
|
+
issuer = await openid_client_1.Issuer.discover(ISSUER_PROD);
|
|
101
|
+
clientId = CLIENT_ID_PROD;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
issuer = await openid_client_1.Issuer.discover(ISSUER_DEV);
|
|
105
|
+
clientId = CLIENT_ID_DEV;
|
|
106
|
+
}
|
|
95
107
|
const client = new issuer.Client({
|
|
96
108
|
grant_types: [GRANT_TYPE],
|
|
97
|
-
client_id:
|
|
109
|
+
client_id: clientId,
|
|
98
110
|
response_types: [],
|
|
99
111
|
redirect_uris: [],
|
|
100
112
|
token_endpoint_auth_method: 'none',
|
|
@@ -120,7 +132,7 @@ class Login extends command_1.Command {
|
|
|
120
132
|
// "Representative" authenticated call to check the log-in worked as expected.
|
|
121
133
|
const { resp: authCheckResp, error: authCheckErr } = await handler_1.runQuery({
|
|
122
134
|
command: this,
|
|
123
|
-
query: CLIAuthSessionCheckDocument,
|
|
135
|
+
query: exports.CLIAuthSessionCheckDocument,
|
|
124
136
|
variables: {},
|
|
125
137
|
});
|
|
126
138
|
if (authCheckErr || !((_e = (_d = (_c = authCheckResp === null || authCheckResp === void 0 ? void 0 : authCheckResp.data) === null || _c === void 0 ? void 0 : _c.organizationSettings) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.id)) {
|
|
@@ -6,6 +6,7 @@ export default class StartPostgresInstanceSession extends Command {
|
|
|
6
6
|
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
7
7
|
id: flags.IOptionFlag<string | undefined>;
|
|
8
8
|
accessLevelRemoteId: flags.IOptionFlag<string | undefined>;
|
|
9
|
+
sessionId: flags.IOptionFlag<string | undefined>;
|
|
9
10
|
};
|
|
10
11
|
run(): Promise<void>;
|
|
11
12
|
}
|
|
@@ -6,6 +6,7 @@ const cmd_1 = require("../../lib/cmd");
|
|
|
6
6
|
const apollo_1 = require("../../lib/apollo");
|
|
7
7
|
const inquirer = require("inquirer");
|
|
8
8
|
const resources_1 = require("../../lib/resources");
|
|
9
|
+
const common_1 = require("../../lib/common");
|
|
9
10
|
const ListPostgresInstancesDocument = `
|
|
10
11
|
query ListPostgresInstances {
|
|
11
12
|
resources(input: {serviceType: POSTGRES, onlyMine: true, maxNumEntries: 1000}) {
|
|
@@ -20,8 +21,8 @@ query ListPostgresInstances {
|
|
|
20
21
|
}
|
|
21
22
|
}`;
|
|
22
23
|
const StartPostgresInstanceSessionDocument = `
|
|
23
|
-
mutation StartPostgresInstanceSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
24
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
24
|
+
mutation StartPostgresInstanceSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
25
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
25
26
|
__typename
|
|
26
27
|
... on CreateSessionResult {
|
|
27
28
|
session {
|
|
@@ -38,9 +39,18 @@ mutation StartPostgresInstanceSession($id: ResourceId!, $accessLevel: ResourceAc
|
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
}
|
|
42
|
+
... on SessionNotFoundError {
|
|
43
|
+
message
|
|
44
|
+
}
|
|
45
|
+
... on MfaInvalidError {
|
|
46
|
+
message
|
|
47
|
+
}
|
|
41
48
|
... on ResourceNotFoundError {
|
|
42
49
|
message
|
|
43
50
|
}
|
|
51
|
+
... on EndSystemAuthorizationError {
|
|
52
|
+
message
|
|
53
|
+
}
|
|
44
54
|
}
|
|
45
55
|
}`;
|
|
46
56
|
class StartPostgresInstanceSession extends command_1.Command {
|
|
@@ -49,6 +59,7 @@ class StartPostgresInstanceSession extends command_1.Command {
|
|
|
49
59
|
const { flags } = this.parse(StartPostgresInstanceSession);
|
|
50
60
|
let instanceId = flags.id;
|
|
51
61
|
let instanceName = null;
|
|
62
|
+
const sessionId = flags.sessionId;
|
|
52
63
|
// TODO: RESOURCES-1: How do we grant access to a perm using ID
|
|
53
64
|
if (!instanceId) {
|
|
54
65
|
const { resp: postgresInstancesResp, error } = await handler_1.runQuery({
|
|
@@ -100,6 +111,7 @@ class StartPostgresInstanceSession extends command_1.Command {
|
|
|
100
111
|
variables: {
|
|
101
112
|
id: instanceId,
|
|
102
113
|
accessLevel,
|
|
114
|
+
sessionId,
|
|
103
115
|
},
|
|
104
116
|
});
|
|
105
117
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
@@ -138,6 +150,10 @@ class StartPostgresInstanceSession extends command_1.Command {
|
|
|
138
150
|
}
|
|
139
151
|
break;
|
|
140
152
|
}
|
|
153
|
+
case 'MfaInvalidError': {
|
|
154
|
+
common_1.handleMfaRedirect(this, instanceId);
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
141
157
|
default:
|
|
142
158
|
apollo_1.printRequestOutput(this, resp, error);
|
|
143
159
|
}
|
|
@@ -160,4 +176,8 @@ StartPostgresInstanceSession.flags = {
|
|
|
160
176
|
multiple: false,
|
|
161
177
|
description: 'The remote ID of the access level with which to access the database.',
|
|
162
178
|
}),
|
|
179
|
+
sessionId: command_1.flags.string({
|
|
180
|
+
multiple: false,
|
|
181
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
182
|
+
}),
|
|
163
183
|
};
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Command } from '@oclif/command';
|
|
2
|
+
export default class SetToken extends Command {
|
|
3
|
+
static description: string;
|
|
4
|
+
static examples: string[];
|
|
5
|
+
static flags: {
|
|
6
|
+
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
7
|
+
};
|
|
8
|
+
static args: never[];
|
|
9
|
+
run(): Promise<void>;
|
|
10
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const command_1 = require("@oclif/command");
|
|
4
|
+
const keytar = require("keytar");
|
|
5
|
+
const inquirer = require("inquirer");
|
|
6
|
+
const apollo_1 = require("../lib/apollo");
|
|
7
|
+
const credentials_1 = require("../lib/credentials");
|
|
8
|
+
const handler_1 = require("../handler");
|
|
9
|
+
const credentials_2 = require("../lib/credentials");
|
|
10
|
+
const login_1 = require("./login");
|
|
11
|
+
class SetToken extends command_1.Command {
|
|
12
|
+
async run() {
|
|
13
|
+
var _a, _b, _c;
|
|
14
|
+
try {
|
|
15
|
+
await apollo_1.initClient(this);
|
|
16
|
+
const { apiToken } = await inquirer.prompt([
|
|
17
|
+
{
|
|
18
|
+
name: 'apiToken',
|
|
19
|
+
message: 'Enter your API Key:',
|
|
20
|
+
type: 'password',
|
|
21
|
+
validate: key => Boolean(key),
|
|
22
|
+
},
|
|
23
|
+
]);
|
|
24
|
+
// Clear previously-stored credentials from keychain if they exist
|
|
25
|
+
let email;
|
|
26
|
+
let organizationID;
|
|
27
|
+
if (await credentials_1.cred.accessToken) {
|
|
28
|
+
email = await credentials_1.cred.email;
|
|
29
|
+
organizationID = await credentials_1.cred.organizationID;
|
|
30
|
+
await credentials_1.cred.removeCredentials(-1);
|
|
31
|
+
}
|
|
32
|
+
// Store API token in keychain - mimics login command
|
|
33
|
+
await keytar.setPassword(credentials_2.OPAL_CREDS_KEY, (email || 'unset-email') + '|' + organizationID, apiToken || '');
|
|
34
|
+
// "Representative" authenticated call to check the log-in worked as expected.
|
|
35
|
+
const { resp: authCheckResp, error: authCheckErr } = await handler_1.runQuery({
|
|
36
|
+
command: this,
|
|
37
|
+
query: login_1.CLIAuthSessionCheckDocument,
|
|
38
|
+
variables: {},
|
|
39
|
+
});
|
|
40
|
+
if (authCheckErr ||
|
|
41
|
+
!((_c = (_b = (_a = authCheckResp === null || authCheckResp === void 0 ? void 0 : authCheckResp.data) === null || _a === void 0 ? void 0 : _a.organizationSettings) === null || _b === void 0 ? void 0 : _b.settings) === null || _c === void 0 ? void 0 : _c.id)) {
|
|
42
|
+
this.log('Error verifying log in. Authenticated commands may fail. Please double check your API token and use `opal logout; opal set-token` to try again.\n');
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
this.log('🎉 You have successfully authenticated with Opal! You can now run authenticated commands.\n');
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
this.error(error);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
exports.default = SetToken;
|
|
53
|
+
SetToken.description = 'Sets an API token to authenticate with the Opal server - alternative auth flow for headless environments.';
|
|
54
|
+
SetToken.examples = ['$ opal set-token'];
|
|
55
|
+
SetToken.flags = {
|
|
56
|
+
help: command_1.flags.help({ char: 'h' }),
|
|
57
|
+
};
|
|
58
|
+
SetToken.args = [];
|
|
@@ -7,6 +7,7 @@ export default class SetUrl extends Command {
|
|
|
7
7
|
custom: flags.IOptionFlag<string | undefined>;
|
|
8
8
|
allowSelfSignedCerts: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
9
9
|
prod: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
10
|
+
staging: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
10
11
|
demo: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
11
12
|
dev: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
12
13
|
devLocal: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
package/lib/commands/set-url.js
CHANGED
|
@@ -14,6 +14,9 @@ class SetUrl extends command_1.Command {
|
|
|
14
14
|
else if (flags.prod) {
|
|
15
15
|
url = 'https://app.opal.dev';
|
|
16
16
|
}
|
|
17
|
+
else if (flags.staging) {
|
|
18
|
+
url = 'https://staging.opal.dev';
|
|
19
|
+
}
|
|
17
20
|
else if (flags.demo) {
|
|
18
21
|
url = 'https://demo.opal.dev';
|
|
19
22
|
}
|
|
@@ -46,6 +49,7 @@ SetUrl.flags = {
|
|
|
46
49
|
}),
|
|
47
50
|
allowSelfSignedCerts: command_1.flags.boolean(),
|
|
48
51
|
prod: command_1.flags.boolean(),
|
|
52
|
+
staging: command_1.flags.boolean(),
|
|
49
53
|
demo: command_1.flags.boolean(),
|
|
50
54
|
dev: command_1.flags.boolean(),
|
|
51
55
|
devLocal: command_1.flags.boolean(),
|
|
@@ -5,9 +5,10 @@ const handler_1 = require("../../handler");
|
|
|
5
5
|
const apollo_1 = require("../../lib/apollo");
|
|
6
6
|
const cmd_1 = require("../../lib/cmd");
|
|
7
7
|
const ssh_1 = require("../../lib/ssh");
|
|
8
|
+
const common_1 = require("../../lib/common");
|
|
8
9
|
const StartSSHSessionDocument = `
|
|
9
|
-
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
10
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
10
|
+
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
11
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
11
12
|
__typename
|
|
12
13
|
... on CreateSessionResult {
|
|
13
14
|
session {
|
|
@@ -26,9 +27,18 @@ mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInpu
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
}
|
|
30
|
+
... on SessionNotFoundError {
|
|
31
|
+
message
|
|
32
|
+
}
|
|
33
|
+
... on MfaInvalidError {
|
|
34
|
+
message
|
|
35
|
+
}
|
|
29
36
|
... on ResourceNotFoundError {
|
|
30
37
|
message
|
|
31
38
|
}
|
|
39
|
+
... on EndSystemAuthorizationError {
|
|
40
|
+
message
|
|
41
|
+
}
|
|
32
42
|
}
|
|
33
43
|
}`;
|
|
34
44
|
class StartSCPSession extends command_1.Command {
|
|
@@ -41,6 +51,7 @@ class StartSCPSession extends command_1.Command {
|
|
|
41
51
|
}
|
|
42
52
|
let instanceId = flags.id;
|
|
43
53
|
let instanceName = null;
|
|
54
|
+
const sessionId = flags.sessionId;
|
|
44
55
|
if (!instanceId) {
|
|
45
56
|
const selectedInstance = await ssh_1.selectComputeInstance(this, 'SCP into');
|
|
46
57
|
if (!selectedInstance) {
|
|
@@ -52,7 +63,7 @@ class StartSCPSession extends command_1.Command {
|
|
|
52
63
|
const { resp, error } = await handler_1.runMutation({
|
|
53
64
|
command: this,
|
|
54
65
|
query: StartSSHSessionDocument,
|
|
55
|
-
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL },
|
|
66
|
+
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL, sessionId },
|
|
56
67
|
});
|
|
57
68
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
58
69
|
case 'CreateSessionResult': {
|
|
@@ -75,6 +86,10 @@ class StartSCPSession extends command_1.Command {
|
|
|
75
86
|
}
|
|
76
87
|
break;
|
|
77
88
|
}
|
|
89
|
+
case 'MfaInvalidError': {
|
|
90
|
+
common_1.handleMfaRedirect(this, instanceId);
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
78
93
|
default:
|
|
79
94
|
apollo_1.printRequestOutput(this, resp, error);
|
|
80
95
|
}
|
|
@@ -109,4 +124,8 @@ StartSCPSession.flags = {
|
|
|
109
124
|
multiple: false,
|
|
110
125
|
description: 'The ID of the Opal instance resource.',
|
|
111
126
|
}),
|
|
127
|
+
sessionId: command_1.flags.string({
|
|
128
|
+
multiple: false,
|
|
129
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
130
|
+
}),
|
|
112
131
|
};
|
|
@@ -5,9 +5,10 @@ const handler_1 = require("../../handler");
|
|
|
5
5
|
const apollo_1 = require("../../lib/apollo");
|
|
6
6
|
const cmd_1 = require("../../lib/cmd");
|
|
7
7
|
const ssh_1 = require("../../lib/ssh");
|
|
8
|
+
const common_1 = require("../../lib/common");
|
|
8
9
|
const StartSSHSessionDocument = `
|
|
9
|
-
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
10
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
10
|
+
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
11
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
11
12
|
__typename
|
|
12
13
|
... on CreateSessionResult {
|
|
13
14
|
session {
|
|
@@ -26,9 +27,18 @@ mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInpu
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
}
|
|
30
|
+
... on SessionNotFoundError {
|
|
31
|
+
message
|
|
32
|
+
}
|
|
33
|
+
... on MfaInvalidError {
|
|
34
|
+
message
|
|
35
|
+
}
|
|
29
36
|
... on ResourceNotFoundError {
|
|
30
37
|
message
|
|
31
38
|
}
|
|
39
|
+
... on EndSystemAuthorizationError {
|
|
40
|
+
message
|
|
41
|
+
}
|
|
32
42
|
}
|
|
33
43
|
}`;
|
|
34
44
|
class StartSCPSession extends command_1.Command {
|
|
@@ -41,6 +51,7 @@ class StartSCPSession extends command_1.Command {
|
|
|
41
51
|
}
|
|
42
52
|
let instanceId = flags.id;
|
|
43
53
|
let instanceName = null;
|
|
54
|
+
const sessionId = flags.sessionId;
|
|
44
55
|
if (!instanceId) {
|
|
45
56
|
const selectedInstance = await ssh_1.selectComputeInstance(this, 'SCP into');
|
|
46
57
|
if (!selectedInstance) {
|
|
@@ -52,7 +63,7 @@ class StartSCPSession extends command_1.Command {
|
|
|
52
63
|
const { resp, error } = await handler_1.runMutation({
|
|
53
64
|
command: this,
|
|
54
65
|
query: StartSSHSessionDocument,
|
|
55
|
-
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL },
|
|
66
|
+
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL, sessionId },
|
|
56
67
|
});
|
|
57
68
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
58
69
|
case 'CreateSessionResult': {
|
|
@@ -75,6 +86,10 @@ class StartSCPSession extends command_1.Command {
|
|
|
75
86
|
}
|
|
76
87
|
break;
|
|
77
88
|
}
|
|
89
|
+
case 'MfaInvalidError': {
|
|
90
|
+
common_1.handleMfaRedirect(this, instanceId);
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
78
93
|
default:
|
|
79
94
|
apollo_1.printRequestOutput(this, resp, error);
|
|
80
95
|
}
|
|
@@ -109,4 +124,8 @@ StartSCPSession.flags = {
|
|
|
109
124
|
multiple: false,
|
|
110
125
|
description: 'The ID of the Opal instance resource.',
|
|
111
126
|
}),
|
|
127
|
+
sessionId: command_1.flags.string({
|
|
128
|
+
multiple: false,
|
|
129
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
130
|
+
}),
|
|
112
131
|
};
|
|
@@ -7,9 +7,10 @@ const apollo_1 = require("../../lib/apollo");
|
|
|
7
7
|
const ssh_1 = require("../../lib/ssh");
|
|
8
8
|
const get_1 = require("../../commands/resources/get");
|
|
9
9
|
const aws_1 = require("../../lib/aws");
|
|
10
|
+
const common_1 = require("../../lib/common");
|
|
10
11
|
const StartSSHSessionDocument = `
|
|
11
|
-
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput
|
|
12
|
-
createSession(input: {resourceId: $id, accessLevel: $accessLevel}) {
|
|
12
|
+
mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInput!, $sessionId: SessionId) {
|
|
13
|
+
createSession(input: {resourceId: $id, accessLevel: $accessLevel, sessionId: $sessionId}) {
|
|
13
14
|
__typename
|
|
14
15
|
... on CreateSessionResult {
|
|
15
16
|
session {
|
|
@@ -28,9 +29,18 @@ mutation StartSSHSession($id: ResourceId!, $accessLevel: ResourceAccessLevelInpu
|
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
}
|
|
32
|
+
... on SessionNotFoundError {
|
|
33
|
+
message
|
|
34
|
+
}
|
|
35
|
+
... on MfaInvalidError {
|
|
36
|
+
message
|
|
37
|
+
}
|
|
31
38
|
... on ResourceNotFoundError {
|
|
32
39
|
message
|
|
33
40
|
}
|
|
41
|
+
... on EndSystemAuthorizationError {
|
|
42
|
+
message
|
|
43
|
+
}
|
|
34
44
|
}
|
|
35
45
|
}`;
|
|
36
46
|
class StartSSHSession extends command_1.Command {
|
|
@@ -43,6 +53,7 @@ class StartSSHSession extends command_1.Command {
|
|
|
43
53
|
}
|
|
44
54
|
let instanceId = flags.id;
|
|
45
55
|
let instanceName = null;
|
|
56
|
+
const sessionId = flags.sessionId;
|
|
46
57
|
// TODO: RESOURCES-1: How do we grant access to a perm using ID
|
|
47
58
|
if (!instanceId) {
|
|
48
59
|
const selectedInstance = await ssh_1.selectComputeInstance(this, 'SSH into');
|
|
@@ -69,7 +80,7 @@ class StartSSHSession extends command_1.Command {
|
|
|
69
80
|
const { resp, error } = await handler_1.runMutation({
|
|
70
81
|
command: this,
|
|
71
82
|
query: StartSSHSessionDocument,
|
|
72
|
-
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL },
|
|
83
|
+
variables: { id: instanceId, accessLevel: cmd_1.DEFAULT_ACCESS_LEVEL, sessionId },
|
|
73
84
|
});
|
|
74
85
|
switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
|
|
75
86
|
case 'CreateSessionResult': {
|
|
@@ -90,6 +101,10 @@ class StartSSHSession extends command_1.Command {
|
|
|
90
101
|
}
|
|
91
102
|
break;
|
|
92
103
|
}
|
|
104
|
+
case 'MfaInvalidError': {
|
|
105
|
+
common_1.handleMfaRedirect(this, instanceId);
|
|
106
|
+
break;
|
|
107
|
+
}
|
|
93
108
|
default:
|
|
94
109
|
apollo_1.printRequestOutput(this, resp, error);
|
|
95
110
|
}
|
|
@@ -107,4 +122,14 @@ StartSSHSession.flags = {
|
|
|
107
122
|
multiple: false,
|
|
108
123
|
description: 'The ID of the Opal instance resource.',
|
|
109
124
|
}),
|
|
125
|
+
// TODO: Unfortunately allowing SSM over SSH disables logging
|
|
126
|
+
// user: flags.string({
|
|
127
|
+
// multiple: false,
|
|
128
|
+
// required: false,
|
|
129
|
+
// default: "ssm-user",
|
|
130
|
+
// }),
|
|
131
|
+
sessionId: command_1.flags.string({
|
|
132
|
+
multiple: false,
|
|
133
|
+
description: 'SessionId of a session that has already been created via the web flow.',
|
|
134
|
+
}),
|
|
110
135
|
};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleMfaRedirect = void 0;
|
|
4
|
+
const config_1 = require("./config");
|
|
5
|
+
const open = require("open");
|
|
6
|
+
exports.handleMfaRedirect = (command, resourceId) => {
|
|
7
|
+
command.log('❗ MFA validation needed. Please connect via browser. Redirecting...');
|
|
8
|
+
const configData = config_1.getOrCreateConfigData(command.config.configDir);
|
|
9
|
+
const url = configData[config_1.urlKey];
|
|
10
|
+
setTimeout(() => {
|
|
11
|
+
open(url + `/resources/${resourceId}?showModal=true`);
|
|
12
|
+
}, 2000);
|
|
13
|
+
};
|
package/lib/lib/config.d.ts
CHANGED
|
@@ -4,3 +4,4 @@ export declare const allowSelfSignedCertsKey = "allowSelfSignedCerts";
|
|
|
4
4
|
export declare const defaultAllowSelfSignedCerts = false;
|
|
5
5
|
export declare const getOrCreateConfigData: (configDir: string) => Record<string, any>;
|
|
6
6
|
export declare const writeConfigData: (configDir: string, newConfigData: Record<string, any>) => void;
|
|
7
|
+
export declare const isProduction: (configDir: string) => boolean;
|
package/lib/lib/config.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.writeConfigData = exports.getOrCreateConfigData = exports.defaultAllowSelfSignedCerts = exports.allowSelfSignedCertsKey = exports.defaultUrl = exports.urlKey = void 0;
|
|
3
|
+
exports.isProduction = exports.writeConfigData = exports.getOrCreateConfigData = exports.defaultAllowSelfSignedCerts = exports.allowSelfSignedCertsKey = exports.defaultUrl = exports.urlKey = void 0;
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
exports.urlKey = 'url';
|
|
@@ -50,3 +50,12 @@ exports.writeConfigData = (configDir, newConfigData) => {
|
|
|
50
50
|
mode: 0o0600,
|
|
51
51
|
});
|
|
52
52
|
};
|
|
53
|
+
exports.isProduction = (configDir) => {
|
|
54
|
+
const configData = exports.getOrCreateConfigData(configDir);
|
|
55
|
+
// Custom URLs are considered production since it includes on-prem
|
|
56
|
+
return configData[exports.urlKey] !== 'https://dev.opal.dev' &&
|
|
57
|
+
configData[exports.urlKey] !== 'http://localhost:3000' &&
|
|
58
|
+
configData[exports.urlKey] !== 'http://localhost:4000' &&
|
|
59
|
+
configData[exports.urlKey] !== 'https://demo.opal.dev' &&
|
|
60
|
+
configData[exports.urlKey] !== 'https://staging.opal.dev';
|
|
61
|
+
};
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"2.0.
|
|
1
|
+
{"version":"2.0.14","commands":{"curl-example":{"id":"curl-example","description":"Prints out an example cURL command containing the parameters the CLI uses to query the Opal server.","pluginName":"opal-security","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Authenticates you with the Opal server.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["$ opal login"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"logout":{"id":"logout","description":"Clears locally stored Opal server authentication credentials.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["$ opal logout"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"set-token":{"id":"set-token","description":"Sets an API token to authenticate with the Opal server - alternative auth flow for headless environments.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["$ opal set-token"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"set-url":{"id":"set-url","description":"Sets the url of the Opal server. Defaults to https://app.opal.dev.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["$ opal set-host"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"custom":{"name":"custom","type":"option"},"allowSelfSignedCerts":{"name":"allowSelfSignedCerts","type":"boolean","allowNo":false},"prod":{"name":"prod","type":"boolean","allowNo":false},"staging":{"name":"staging","type":"boolean","allowNo":false},"demo":{"name":"demo","type":"boolean","allowNo":false},"dev":{"name":"dev","type":"boolean","allowNo":false},"devLocal":{"name":"devLocal","type":"boolean","allowNo":false}},"args":[]},"aws:identity":{"id":"aws:identity","description":"Gets the current caller identity for the \"opal\" AWS profile.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal aws:identity"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"iam-roles:start":{"id":"iam-roles:start","description":"Starts a session to assume an IAM role.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal iam-roles:start","opal iam-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"id":{"name":"id","type":"option","description":"The ID of the Opal role resource."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]},"kube-roles:start":{"id":"kube-roles:start","description":"Starts a session to assume a Kubernetes cluster IAM role.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal kube-roles:start","opal kube-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398","opal kube-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --accessLevelRemoteId \"arn:aws:iam::712234975475:role/acme-eks-cluster-admin-role\""],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"id":{"name":"id","type":"option","description":"The ID of the Opal role resource."},"accessLevelRemoteId":{"name":"accessLevelRemoteId","type":"option","description":"The remote ID of the access level with which to access the cluster."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]},"postgres-instances:start":{"id":"postgres-instances:start","description":"Starts a session to query a Postgres database.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal postgres-instances:start","opal postgres-instances:start --id 51f7176b-0464-4a6f-8369-e951e187b398","opal postgres-instances:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --accessLevelRemoteId \"fullaccess\""],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"id":{"name":"id","type":"option","description":"The ID of the Opal instance resource."},"accessLevelRemoteId":{"name":"accessLevelRemoteId","type":"option","description":"The remote ID of the access level with which to access the database."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]},"resources:get":{"id":"resources:get","description":"Get resource info for a particular resource.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal resources:get --id 54052a3e-5375-4392-aeaf-0c6c44c131d4"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"id":{"name":"id","type":"option","required":true}},"args":[]},"ssh:copyFrom":{"id":"ssh:copyFrom","description":"Use SCP to copy files from a compute instance.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal ssh:copyFrom --src instance/dir --dest my/dir","opal ssh:copyFrom --src instance/dir --dest my/dir --id 51f7176b-0464-4a6f-8369-e951e187b398"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"src":{"name":"src","type":"option","description":"The path of the directory or file you would like to copy over SCP. Note we only support one file or directory at a time.","required":true},"dest":{"name":"dest","type":"option","description":"Pick which directory you want your files to be copied to.","required":false,"default":"."},"user":{"name":"user","type":"option","description":"Pick which user you want to run SCP over. Keep in mind not all users will have access to each other's home directory.","required":false,"default":"ssm-user"},"id":{"name":"id","type":"option","description":"The ID of the Opal instance resource."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]},"ssh:copyTo":{"id":"ssh:copyTo","description":"Use SCP to copy files to a compute instance.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal ssh:copyTo --src my/dir --dest instance/dir","opal ssh:copyTo --src my/dir --dest instance/dir --id 51f7176b-0464-4a6f-8369-e951e187b398"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"src":{"name":"src","type":"option","description":"The path of the directory or file you would like to copy over SCP. Note we only support one file or directory at a time.","required":true},"dest":{"name":"dest","type":"option","description":"Pick which directory you want your files to be copied to.","required":false,"default":"."},"user":{"name":"user","type":"option","description":"Pick which user you want to run SCP over. Keep in mind not all users will have access to each other's home directory.","required":false,"default":"ssm-user"},"id":{"name":"id","type":"option","description":"The ID of the Opal instance resource."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]},"ssh:start":{"id":"ssh:start","description":"Start an SSH session to access a particular compute instance.","pluginName":"opal-security","pluginType":"core","aliases":[],"examples":["opal ssh:start","opal ssh:start --id 51f7176b-0464-4a6f-8369-e951e187b398"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"id":{"name":"id","type":"option","description":"The ID of the Opal instance resource."},"sessionId":{"name":"sessionId","type":"option","description":"SessionId of a session that has already been created via the web flow."}},"args":[]}}}
|