Merge pull request #53 from /issues/36-fix-failing-user-keys-recovery

Fix failing user keys recovery

Author: dkocher

hub/src/main/java/ch/iterate/hub/core/FirstLoginDeviceSetupCallback.java

@@ -5,6 +5,7 @@
 package ch.iterate.hub.core;
 
 import ch.cyberduck.core.Host;
+import ch.cyberduck.core.UUIDRandomStringService;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
 import ch.cyberduck.core.exception.LoginCanceledException;
 
@@ -29,6 +30,15 @@ public interface FirstLoginDeviceSetupCallback {
      */
     AccountKeyAndDeviceName askForAccountKeyAndDeviceName(Host bookmark, String initialDeviceName) throws ConnectionCanceledException;
 
+    /**
+     * Generate initial account key
+     *
+     * @return Random UUID
+     */
+    default String generateAccountKey() {
+        return new UUIDRandomStringService().random();
+    }
+
     FirstLoginDeviceSetupCallback disabled = new FirstLoginDeviceSetupCallback() {
         @Override
         public String displayAccountKeyAndAskDeviceName(final Host bookmark, final AccountKeyAndDeviceName accountKeyAndDeviceName) throws ConnectionCanceledException {

hub/src/main/java/ch/iterate/hub/workflows/UserKeysServiceImpl.java

@@ -5,7 +5,6 @@
 package ch.iterate.hub.workflows;
 
 import ch.cyberduck.core.Host;
-import ch.cyberduck.core.UUIDRandomStringService;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
 import ch.cyberduck.core.exception.LocalAccessDeniedException;
 
@@ -119,7 +118,7 @@ else if(userKeysInHub) {
                 log.info("(3) Setting up new user keys and setupCode.");
 
                 log.info("(3.1) generate and display new Account Key");
-                final String setupCode = new UUIDRandomStringService().random();
+                final String setupCode = prompt.generateAccountKey();
                 log.info("With setupCode={}", setupCode);
 
                 final String deviceName = prompt.displayAccountKeyAndAskDeviceName(host,

hub/src/test/java/ch/iterate/hub/core/UserKeysRecoveryTest.java

@@ -0,0 +1,51 @@
+package ch.iterate.hub.core;
+
+import ch.cyberduck.core.AlphanumericRandomStringService;
+
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.security.InvalidKeyException;
+import java.util.stream.Stream;
+
+import ch.iterate.hub.client.api.UsersResourceApi;
+import ch.iterate.hub.client.model.UserDto;
+import ch.iterate.hub.crypto.UserKeys;
+import ch.iterate.hub.protocols.hub.HubSession;
+import ch.iterate.hub.testsetup.AbstractHubTest;
+import ch.iterate.hub.testsetup.docker_setup.UnattendedLocalOnly;
+import ch.iterate.hub.testsetup.model.HubTestConfig;
+import com.nimbusds.jose.JOSEException;
+
+import static ch.iterate.hub.testsetup.HubTestSetupConfigs.minioSTSUnattendedLocalOnly;
+import static ch.iterate.hub.testsetup.HubTestUtilities.setupForUser;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@ExtendWith({UnattendedLocalOnly.class})
+public class UserKeysRecoveryTest extends AbstractHubTest {
+
+    private Stream<Arguments> arguments() {
+        return Stream.of(minioSTSUnattendedLocalOnly);
+    }
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    public void firstLoginAndUserKeyRecovery(final HubTestConfig hubTestConfig) throws Exception {
+        final HubSession hubSession = setupForUser(hubTestConfig.hubTestSetupConfig, hubTestConfig.hubTestSetupConfig.USER_001());
+        final UsersResourceApi usersApi = new UsersResourceApi(hubSession.getClient());
+        final UserDto me = usersApi.apiUsersMeGet(true);
+
+        final JOSEException exception = assertThrows(JOSEException.class, () -> UserKeys.recover(me.getEcdhPublicKey(), me.getEcdsaPublicKey(), me.getPrivateKey(),
+                new AlphanumericRandomStringService().random()));
+        assertTrue(exception.getCause() instanceof InvalidKeyException);
+
+        assertNotNull(UserKeys.recover(me.getEcdhPublicKey(), me.getEcdsaPublicKey(), me.getPrivateKey(),
+                hubTestConfig.hubTestSetupConfig.USER_001().setupCode));
+    }
+}

hub/src/test/java/ch/iterate/hub/core/util/MockableFirstLoginDeviceSetupCallback.java

@@ -26,4 +26,9 @@ public String displayAccountKeyAndAskDeviceName(final Host bookmark, final Accou
     public AccountKeyAndDeviceName askForAccountKeyAndDeviceName(final Host bookmark, final String initialDeviceName) throws ConnectionCanceledException {
         return proxy.askForAccountKeyAndDeviceName(bookmark, initialDeviceName);
     }
+
+    @Override
+    public String generateAccountKey() {
+        return proxy.generateAccountKey();
+    }
 }

hub/src/test/java/ch/iterate/hub/testsetup/HubTestUtilities.java

@@ -130,6 +130,11 @@ public AccountKeyAndDeviceName askForAccountKeyAndDeviceName(final Host bookmark
                 return new AccountKeyAndDeviceName().withAccountKey(setupCode).withDeviceName(String.format("firstLoginMockSetup %s", DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL)
                         .format(ZonedDateTime.now(ZoneId.of("Europe/Zurich")))));
             }
+
+            @Override
+            public String generateAccountKey() {
+                return setupCode;
+            }
         };
         MockableFirstLoginDeviceSetupCallback.setProxy(proxy);