99import ch .cyberduck .core .PasswordStoreFactory ;
1010import ch .cyberduck .core .exception .LocalAccessDeniedException ;
1111import ch .cyberduck .core .nio .LocalProtocol ;
12- import ch .iterate .hub .core .FirstLoginDeviceSetupCallback ;
13- import ch .iterate .hub .crypto .DeviceKeys ;
14- import ch .iterate .hub .workflows .exceptions .AccessException ;
12+
1513import org .apache .logging .log4j .LogManager ;
1614import org .apache .logging .log4j .Logger ;
1715
2018
2119import static ch .iterate .hub .crypto .KeyHelper .decodeKeyPair ;
2220
21+ import ch .iterate .hub .core .FirstLoginDeviceSetupCallback ;
22+ import ch .iterate .hub .crypto .DeviceKeys ;
23+ import ch .iterate .hub .workflows .exceptions .AccessException ;
24+
2325public class DeviceKeysServiceImpl implements DeviceKeysService {
2426 private static final Logger log = LogManager .getLogger (DeviceKeysServiceImpl .class .getName ());
2527
@@ -45,7 +47,7 @@ private static String toAccountName(final Host hub) {
4547 @ Override
4648 public DeviceKeys getOrCreateDeviceKeys (final Host hub , final FirstLoginDeviceSetupCallback setup ) throws AccessException {
4749 final DeviceKeys deviceKeys = this .getDeviceKeys (hub );
48- if (DeviceKeys .validate (deviceKeys )) {
50+ if (DeviceKeys .validate (deviceKeys )) {
4951 return deviceKeys ;
5052 }
5153 log .warn ("Create new device key for {}" , hub );
@@ -57,22 +59,24 @@ public DeviceKeys getDeviceKeys(final Host hub) throws AccessException, Security
5759 final String accountName = toAccountName (hub );
5860 try {
5961 final String encodedPublicDeviceKey = store .getPassword (KEYCHAIN_PUBLIC_DEVICE_KEY_ACCOUNT_NAME , accountName );
60- if (null == encodedPublicDeviceKey ) {
62+ if (null == encodedPublicDeviceKey ) {
6163 log .warn ("No public device key found in keychain for {}" , accountName );
6264 return DeviceKeys .notfound ;
6365 }
6466 final String encodedPrivateDeviceKey = store .getPassword (KEYCHAIN_PRIVATE_DEVICE_KEY_ACCOUNT_NAME , accountName );
65- if (null == encodedPrivateDeviceKey ) {
67+ if (null == encodedPrivateDeviceKey ) {
6668 log .warn ("No private device key found in keychain for {}" , accountName );
6769 return DeviceKeys .notfound ;
6870 }
6971 log .debug ("Retrieved device key pair for {} from keychain" , accountName );
7072 try {
7173 return new DeviceKeys (decodeKeyPair (encodedPublicDeviceKey , encodedPrivateDeviceKey ));
72- } catch (InvalidKeySpecException e ) {
74+ }
75+ catch (InvalidKeySpecException e ) {
7376 throw new SecurityException (e );
7477 }
75- } catch (LocalAccessDeniedException e ) {
78+ }
79+ catch (LocalAccessDeniedException e ) {
7680 throw new AccessException (e );
7781 }
7882 }
@@ -88,7 +92,8 @@ protected DeviceKeys storeDeviceKeys(final Host hub, final DeviceKeys deviceKeys
8892 );
8993 log .debug ("Saved device key pair for {} in keychain" , accountName );
9094 return deviceKeys ;
91- } catch (LocalAccessDeniedException e ) {
95+ }
96+ catch (LocalAccessDeniedException e ) {
9297 throw new AccessException (e );
9398 }
9499 }
0 commit comments