-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into 668-ensure-atkeys-file-is-writeable-before-…
…finalizing-pkam-apkam
- Loading branch information
Showing
6 changed files
with
270 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ import 'package:args/args.dart'; | |
| import 'package:at_auth/at_auth.dart'; | ||
| import 'package:at_cli_commons/at_cli_commons.dart'; | ||
| import 'package:at_client/at_client.dart'; | ||
| import 'package:at_commons/at_builders.dart'; | ||
| import 'package:at_lookup/at_lookup.dart'; | ||
| import 'package:at_onboarding_cli/at_onboarding_cli.dart'; | ||
| import 'package:at_onboarding_cli/src/util/at_onboarding_exceptions.dart'; | ||
|
|
@@ -195,6 +196,14 @@ Future<int> wrappedMain(List<String> arguments) async { | |
| // Write keys to @atSign_keys.atKeys IFF it doesn't already exist; if | ||
| // it does exist, then write to @atSign_appName_deviceName_keys.atKeys | ||
| await enroll(commandArgResults); | ||
|
|
||
| case AuthCliCommand.unrevoke: | ||
| await unrevoke( | ||
| commandArgResults, await createAtClient(commandArgResults)); | ||
|
|
||
| case AuthCliCommand.delete: | ||
| await deleteEnrollment( | ||
| commandArgResults, await createAtClient(commandArgResults)); | ||
| } | ||
| } on ArgumentError catch (e) { | ||
| stderr | ||
|
|
@@ -272,10 +281,6 @@ Future<int> status(ArgResults ar) async { | |
| } | ||
|
|
||
| Future<AtClient> createAtClient(ArgResults ar) async { | ||
| if (storageDir != null) { | ||
| throw StateError('AtClient has already been created'); | ||
| } | ||
|
|
||
| String nameSpace = 'at_activate'; | ||
| String atSign = AtUtils.fixAtSign(ar[AuthCliArgs.argNameAtSign]); | ||
| storageDir = standardAtClientStorageDir( | ||
|
|
@@ -317,24 +322,27 @@ Future<void> onboard(ArgResults argResults, {AtOnboardingService? svc}) async { | |
| '[Information] Onboarding your atSign. This may take up to 2 minutes.'); | ||
| try { | ||
| await svc.onboard(); | ||
| logger.finest('svc.onboard() has returned - will exit(0)'); | ||
| exit(0); | ||
| return; | ||
| } on InvalidDataException catch (e) { | ||
| stderr.writeln( | ||
| '[Error] Onboarding failed. Invalid data provided by user. Please try again\nCause: ${e.message}'); | ||
| exit(1); | ||
| throw AtEnrollmentException( | ||
| 'Onboarding failed. Please try again. Cause: ${e.message}'); | ||
| } on InvalidRequestException catch (e) { | ||
| stderr.writeln( | ||
| '[Error] Onboarding failed. Invalid data provided by user. Please try again\nCause: ${e.message}'); | ||
| exit(1); | ||
| } on AtActivateException catch (e) { | ||
| stderr.writeln('[Error] ${e.message}'); | ||
| exit(1); | ||
| } on Exception catch (e) { | ||
| stderr.writeln( | ||
| '[Error] Onboarding failed. It looks like something went wrong on our side.\n' | ||
| 'Please try again or contact [email protected]\nCause: $e'); | ||
| exit(1); | ||
| throw AtEnrollmentException( | ||
| 'Onboarding failed. Please try again. Cause: ${e.message}'); | ||
| } on AtActivateException { | ||
| rethrow; | ||
| } catch (e) { | ||
| throw ('Onboarding failed.' | ||
| ' It looks like something went wrong on our side.' | ||
| ' Please try again or contact [email protected]\nCause: $e'); | ||
| } | ||
| } | ||
|
|
||
| String parseServerResponse(String? response) { | ||
| if (response != null && response.startsWith('data:')) { | ||
| return response.replaceFirst('data:', ''); | ||
| } else { | ||
| throw ('Unexpected server response: $response'); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -588,6 +596,12 @@ Future<void> interactive(ArgResults argResults, AtClient atClient) async { | |
|
|
||
| case AuthCliCommand.revoke: | ||
| await revoke(commandArgResults, atClient); | ||
|
|
||
| case AuthCliCommand.unrevoke: | ||
| await unrevoke(commandArgResults, atClient); | ||
|
|
||
| case AuthCliCommand.delete: | ||
| await deleteEnrollment(commandArgResults, atClient); | ||
| } | ||
| } on ArgumentError catch (e) { | ||
| stderr.writeln( | ||
|
|
@@ -643,8 +657,7 @@ Future<Map> _list( | |
| stdout.writeln("Found ${filtered.length} matching enrollment records"); | ||
| return filtered; | ||
| } else { | ||
| stderr.writeln('Exiting: Unexpected server response: $rawResponse'); | ||
| exit(1); | ||
| throw Exception('Unexpected server response: $rawResponse'); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -676,20 +689,14 @@ Future<void> list(ArgResults ar, AtClient atClient) async { | |
| } | ||
|
|
||
| Future<Map?> _fetch(String eId, AtLookUp atLookup) async { | ||
| String rawResponse = (await atLookup.executeCommand( | ||
| 'enroll:fetch:' | ||
| '{"enrollmentId":"$eId"}' | ||
| '\n', | ||
| auth: true))!; | ||
|
|
||
| if (rawResponse.startsWith('data:')) { | ||
| rawResponse = rawResponse.substring(rawResponse.indexOf('data:') + 5); | ||
| // response is a Map | ||
| return jsonDecode(rawResponse); | ||
| } else { | ||
| stderr.writeln('Exiting: Unexpected server response: $rawResponse'); | ||
| exit(1); | ||
| } | ||
| EnrollVerbBuilder enrollVerbBuilder = EnrollVerbBuilder() | ||
| ..operation = EnrollOperationEnum.fetch | ||
| ..enrollmentId = eId; | ||
| String? response = await atLookup.executeVerb(enrollVerbBuilder); | ||
|
|
||
| response = parseServerResponse(response); | ||
| // response is a Map | ||
| return jsonDecode(response); | ||
| } | ||
|
|
||
| Future<void> fetch(ArgResults argResults, AtClient atClient) async { | ||
|
|
@@ -906,9 +913,10 @@ Future<void> deny(ArgResults ar, AtClient atClient) async { | |
| // Iterate through the requests, deny each one | ||
| for (String eId in toDeny.keys) { | ||
| stdout.writeln('Denying enrollmentId $eId'); | ||
| // 'enroll:deny:{"enrollmentId":"$enrollmentId"}' | ||
| String? response = await atLookup | ||
| .executeCommand('enroll:deny:{"enrollmentId":"$eId"}\n', auth: true); | ||
| EnrollVerbBuilder enrollVerbBuilder = EnrollVerbBuilder() | ||
| ..operation = EnrollOperationEnum.deny | ||
| ..enrollmentId = eId; | ||
| String? response = await atLookup.executeVerb(enrollVerbBuilder); | ||
| stdout.writeln('Server response: $response'); | ||
| } | ||
| } | ||
|
|
@@ -939,6 +947,43 @@ Future<void> revoke(ArgResults ar, AtClient atClient) async { | |
| } | ||
| } | ||
|
|
||
| Future<void> unrevoke(ArgResults ar, AtClient atClient) async { | ||
| AtLookUp atLookup = atClient.getRemoteSecondary()!.atLookUp; | ||
|
|
||
| Map toUnRevoke = await _fetchOrListAndFilter( | ||
| atLookup, | ||
| EnrollmentStatus.approved.name, // must be status approved | ||
| eId: ar[AuthCliArgs.argNameEnrollmentId], | ||
| arx: ar[AuthCliArgs.argNameAppNameRegex], | ||
| drx: ar[AuthCliArgs.argNameDeviceNameRegex], | ||
| ); | ||
|
|
||
| if (toUnRevoke.isEmpty) { | ||
| stderr.writeln('No matching enrollment(s) found'); | ||
| return; | ||
| } | ||
|
|
||
| for (String eId in toUnRevoke.keys) { | ||
| stdout.writeln('Un-Revoking enrollmentId $eId'); | ||
| String? response = await atLookup.executeCommand( | ||
| 'enroll:unrevoke:{"enrollmentId":"$eId"}\n', | ||
| auth: true); | ||
| stdout.writeln('Server response: $response'); | ||
| } | ||
| } | ||
|
|
||
| Future<void> deleteEnrollment(ArgResults ar, AtClient atClient) async { | ||
| AtLookUp atLookup = atClient.getRemoteSecondary()!.atLookUp; | ||
| String eId = ar[AuthCliArgs.argNameEnrollmentId]; | ||
| EnrollVerbBuilder enrollVerbBuilder = EnrollVerbBuilder() | ||
| ..enrollmentId = eId | ||
| ..operation = EnrollOperationEnum.delete; | ||
| stdout.writeln('Sending delete request'); | ||
| String? response = await atLookup.executeVerb(enrollVerbBuilder); | ||
| response = parseServerResponse(response); | ||
| stdout.writeln('Server response: $response'); | ||
| } | ||
|
|
||
| @visibleForTesting | ||
| AtOnboardingService createOnboardingService(ArgResults ar) { | ||
| String atSign = AtUtils.fixAtSign(ar[AuthCliArgs.argNameAtSign]); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.