Save account key in keychain.

Author: dkocher

hub/src/main/java/cloud/katta/core/DeviceSetupCallback.java

@@ -17,10 +17,10 @@ public interface DeviceSetupCallback {
     /**
      * Prompt user for device name
      *
-     * @return Device name
+     * @return Account key and device name
      * @throws AccessException Canceled prompt by user
      */
-    String displayAccountKeyAndAskDeviceName(Host bookmark, AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException;
+    AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(Host bookmark, AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException;
 
     /**
      * Prompt user for existing account key
@@ -50,7 +50,7 @@ default UserKeys generateUserKeys() {
 
     DeviceSetupCallback disabled = new DeviceSetupCallback() {
         @Override
-        public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
+        public AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
             throw new AccessException("Disabled");
         }
 

hub/src/main/java/cloud/katta/workflows/UserKeysServiceImpl.java

@@ -5,6 +5,8 @@
 package cloud.katta.workflows;
 
 import ch.cyberduck.core.Host;
+import ch.cyberduck.core.PasswordStoreFactory;
+import ch.cyberduck.core.exception.LocalAccessDeniedException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,7 +79,11 @@ public UserKeys getOrCreateUserKeys(final Host hub, final UserDto me, final Devi
                     case 404:
                         log.warn("Device keys from keychain not present in hub. Setting up existing device w/ Account Key for existing user keys.");
                         // Setup existing device w/ Account Key (e.g. same device for multiple hubs)
-                        return this.recover(me, deviceKeyPair, prompt.askForAccountKeyAndDeviceName(hub, COMPUTER_NAME));
+                        final AccountKeyAndDeviceName input = prompt.askForAccountKeyAndDeviceName(hub, COMPUTER_NAME);
+                        if(input.addToKeychain()) {
+                            this.save(hub, me, input.accountKey());
+                        }
+                        return this.recover(me, deviceKeyPair, input);
                     default:
                         throw e;
                 }
@@ -94,14 +100,25 @@ else if(validate(me)) {
             // TODO https://github.com/shift7-ch/katta-server/issues/27
             // private key generated with P384KeyPair causes "Unexpected Error: Data provided to an operation does not meet requirements" in `UserKeys.recover`: `const privateKey = await crypto.subtle.importKey('pkcs8', decodedPrivateKey, UserKeys.KEY_DESIGNATION, false, UserKeys.KEY_USAGES);`
             final String accountKey = prompt.generateAccountKey();
-            final String deviceName = prompt.displayAccountKeyAndAskDeviceName(hub,
+            final AccountKeyAndDeviceName input = prompt.displayAccountKeyAndAskDeviceName(hub,
                     new AccountKeyAndDeviceName().withAccountKey(accountKey).withDeviceName(COMPUTER_NAME));
-
-            return this.uploadDeviceKeys(deviceName,
+            if(input.addToKeychain()) {
+                this.save(hub, me, accountKey);
+            }
+            return this.uploadDeviceKeys(input.deviceName(),
                     this.uploadUserKeys(me, prompt.generateUserKeys(), accountKey), deviceKeyPair);
         }
     }
 
+    private void save(final Host hub, final UserDto me, final String accountKey) {
+        try {
+            PasswordStoreFactory.get().addPassword(hub.getNickname(), me.getEmail(), accountKey);
+        }
+        catch(LocalAccessDeniedException ex) {
+            log.warn("Failure saving account key", ex);
+        }
+    }
+
     private UserKeys recover(final UserDto me, final DeviceKeys deviceKeyPair, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws
             ApiException, SecurityFailure {
         try {

hub/src/test/java/cloud/katta/core/util/MockableDeviceSetupCallback.java

@@ -18,7 +18,7 @@ public static void setProxy(final DeviceSetupCallback proxy) {
     private static DeviceSetupCallback proxy = null;
 
     @Override
-    public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
+    public AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
         return proxy.displayAccountKeyAndAskDeviceName(bookmark, accountKeyAndDeviceName);
     }
 

hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java

@@ -204,24 +204,26 @@ protected static HubSession setupConnection(final HubTestConfig.Setup setup) thr
     }
 
     protected static @NotNull DeviceSetupCallback deviceSetupCallback(HubTestConfig.Setup setup) {
-        final DeviceSetupCallback proxy = new DeviceSetupCallback() {
+        return new DeviceSetupCallback() {
             @Override
-            public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) {
-                return "firstLoginMockSetup";
+            public AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) {
+                return new AccountKeyAndDeviceName().withAccountKey(setup.userConfig.setupCode).withDeviceName(
+                        String.format("%s %s", accountKeyAndDeviceName.deviceName(), DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL)
+                                .format(ZonedDateTime.now(ZoneId.of("Europe/Zurich")))));
             }
 
             @Override
             public AccountKeyAndDeviceName askForAccountKeyAndDeviceName(final Host bookmark, final String initialDeviceName) {
-                return new AccountKeyAndDeviceName().withAccountKey(setup.userConfig.setupCode).withDeviceName(String.format("firstLoginMockSetup %s", DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL)
-                        .format(ZonedDateTime.now(ZoneId.of("Europe/Zurich")))));
+                return new AccountKeyAndDeviceName().withAccountKey(setup.userConfig.setupCode).withDeviceName(
+                        String.format("%s %s", initialDeviceName, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL)
+                                .format(ZonedDateTime.now(ZoneId.of("Europe/Zurich")))));
             }
 
             @Override
             public String generateAccountKey() {
                 return staticSetupCode();
             }
         };
-        return proxy;
     }
 }
 

osx/src/main/java/cloud/katta/controller/PromptDeviceSetupCallback.java

@@ -27,7 +27,7 @@ public PromptDeviceSetupCallback(final ProxyController controller) {
     }
 
     @Override
-    public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
+    public AccountKeyAndDeviceName displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws AccessException {
         if(log.isDebugEnabled()) {
             log.debug(String.format("Display Account Key for %s", bookmark));
         }
@@ -37,7 +37,7 @@ public String displayAccountKeyAndAskDeviceName(final Host bookmark, final Accou
             case SheetCallback.ALTERNATE_OPTION:
                 throw new AccessException(new ConnectionCanceledException());
         }
-        return accountKeyAndDeviceName.deviceName();
+        return accountKeyAndDeviceName;
     }
 
     @Override