mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-20 06:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusted to latest API-changes

Browse Source
This commit is contained in:
Sebastian Stenzel
2023-07-06 18:57:10 +02:00
parent 8cb21c97e3
commit cd10d38990
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
+29 -15
View File
@@ -1,5 +1,8 @@
package org.cryptomator.ui.keyloading.hub; package org.cryptomator.ui.keyloading.hub;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jose.JWEObject; import com.nimbusds.jose.JWEObject;
import dagger.Lazy; import dagger.Lazy;
import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.Vault;
@@ -8,6 +11,7 @@ import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene; import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.keyloading.KeyLoading; import org.cryptomator.ui.keyloading.KeyLoading;
import org.cryptomator.ui.keyloading.KeyLoadingScoped; import org.cryptomator.ui.keyloading.KeyLoadingScoped;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -27,6 +31,7 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.time.Instant;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@@ -37,6 +42,7 @@ public class ReceiveKeyController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(ReceiveKeyController.class); private static final Logger LOG = LoggerFactory.getLogger(ReceiveKeyController.class);
private static final String SCHEME_PREFIX = "hub+"; private static final String SCHEME_PREFIX = "hub+";
private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true);
private final Stage window; private final Stage window;
private final HubConfig hubConfig; private final HubConfig hubConfig;
@@ -68,20 +74,20 @@ public class ReceiveKeyController implements FxController {
@FXML @FXML
public void initialize() { public void initialize() {
requestUserToken(); requestVaultMasterkey();
} }
/** /**
* STEP 1 (Request): GET vault key for this user * STEP 1 (Request): GET vault key for this user
*/ */
private void requestUserToken() { private void requestVaultMasterkey() {
var userTokenUri = appendPath(vaultBaseUri, "/user-tokens/me"); var accessTokenUri = appendPath(vaultBaseUri, "/access-token");
var request = HttpRequest.newBuilder(userTokenUri) // var request = HttpRequest.newBuilder(accessTokenUri) //
.header("Authorization", "Bearer " + bearerToken) // .header("Authorization", "Bearer " + bearerToken) //
.GET() // .GET() //
.build(); .build();
httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) // httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) //
.thenAcceptAsync(this::receivedUserTokenResponse, Platform::runLater) // .thenAcceptAsync(this::receivedVaultMasterkey, Platform::runLater) //
.exceptionally(this::retrievalFailed); .exceptionally(this::retrievalFailed);
} }
@@ -90,14 +96,15 @@ public class ReceiveKeyController implements FxController {
* *
* @param response Response * @param response Response
*/ */
private void receivedUserTokenResponse(HttpResponse<String> response) { private void receivedVaultMasterkey(HttpResponse<String> response) {
LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode()); LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode());
try { try {
switch (response.statusCode()) { switch (response.statusCode()) {
case 200 -> requestDeviceToken(response.body()); case 200 -> requestUserKey(response.body());
case 402 -> licenseExceeded(); case 402 -> licenseExceeded();
case 403 -> accessNotGranted(); case 403 -> accessNotGranted();
case 404 -> requestLegacyAccessToken(); case 404 -> requestLegacyAccessToken();
case 410 -> throw new IOException("Vault has been archived."); // TODO add dialog
default -> throw new IOException("Unexpected response " + response.statusCode()); default -> throw new IOException("Unexpected response " + response.statusCode());
} }
} catch (IOException e) { } catch (IOException e) {
@@ -108,14 +115,14 @@ public class ReceiveKeyController implements FxController {
/** /**
* STEP 2 (Request): GET user key for this device * STEP 2 (Request): GET user key for this device
*/ */
private void requestDeviceToken(String encryptedVaultKey) { private void requestUserKey(String encryptedVaultKey) {
var deviceTokenUri = appendPath(URI.create(hubConfig.devicesResourceUrl), "/%s/device-token".formatted(deviceId)); var deviceTokenUri = appendPath(URI.create(hubConfig.devicesResourceUrl), "/%s".formatted(deviceId));
var request = HttpRequest.newBuilder(deviceTokenUri) // var request = HttpRequest.newBuilder(deviceTokenUri) //
.header("Authorization", "Bearer " + bearerToken) // .header("Authorization", "Bearer " + bearerToken) //
.GET() // .GET() //
.build(); .build();
httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) // httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8)) //
.thenAcceptAsync(response -> receivedDeviceTokenResponse(encryptedVaultKey, response), Platform::runLater) // .thenAcceptAsync(response -> receivedUserKey(encryptedVaultKey, response), Platform::runLater) //
.exceptionally(this::retrievalFailed); .exceptionally(this::retrievalFailed);
} }
@@ -124,12 +131,15 @@ public class ReceiveKeyController implements FxController {
* *
* @param response Response * @param response Response
*/ */
private void receivedDeviceTokenResponse(String encryptedVaultKey, HttpResponse<String> response) { private void receivedUserKey(String encryptedVaultKey, HttpResponse<String> response) {
LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode()); LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode());
try { try {
switch (response.statusCode()) { switch (response.statusCode()) {
case 200 -> receivedDeviceTokenSuccess(encryptedVaultKey, response.body()); case 200 -> {
case 403, 404 -> needsDeviceSetup(); // TODO: using the setup code, we can theoretically immediately unlock var device = JSON.reader().readValue(response.body(), DeviceDto.class);
receivedBothEncryptedKeys(encryptedVaultKey, device.userPrivateKey);
}
case 404 -> needsDeviceSetup(); // TODO: using the setup code, we can theoretically immediately unlock
default -> throw new IOException("Unexpected response " + response.statusCode()); default -> throw new IOException("Unexpected response " + response.statusCode());
} }
} catch (IOException e) { } catch (IOException e) {
@@ -141,7 +151,7 @@ public class ReceiveKeyController implements FxController {
window.setScene(setupDeviceScene.get()); window.setScene(setupDeviceScene.get());
} }
private void receivedDeviceTokenSuccess(String encryptedVaultKey, String encryptedUserKey) throws IOException { private void receivedBothEncryptedKeys(String encryptedVaultKey, String encryptedUserKey) throws IOException {
try { try {
var vaultKeyJwe = JWEObject.parse(encryptedVaultKey); var vaultKeyJwe = JWEObject.parse(encryptedVaultKey);
var userKeyJwe = JWEObject.parse(encryptedUserKey); var userKeyJwe = JWEObject.parse(encryptedUserKey);
@@ -180,6 +190,7 @@ public class ReceiveKeyController implements FxController {
case 402 -> licenseExceeded(); case 402 -> licenseExceeded();
case 403 -> accessNotGranted(); case 403 -> accessNotGranted();
case 404 -> needsLegacyDeviceRegistration(); case 404 -> needsLegacyDeviceRegistration();
case 410 -> throw new IOException("Vault has been archived."); // TODO add dialog
default -> throw new IOException("Unexpected response " + response.statusCode()); default -> throw new IOException("Unexpected response " + response.statusCode());
} }
} catch (IOException e) { } catch (IOException e) {
@@ -246,4 +257,7 @@ public class ReceiveKeyController implements FxController {
throw new IllegalStateException("URI constructed from params known to be valid", e); throw new IllegalStateException("URI constructed from params known to be valid", e);
} }
} }
@JsonIgnoreProperties(ignoreUnknown = true)
private record DeviceDto(@JsonProperty(value = "userPrivateKey", required = true) String userPrivateKey) {}
} }
src/main/java/org/cryptomator/ui/keyloading/hub/SetupDeviceController.java
+4 -5
View File
@@ -133,7 +133,7 @@ public class SetupDeviceController implements FxController {
} }
}).thenCompose(jwe -> { }).thenCompose(jwe -> {
var now = Instant.now().toString(); var now = Instant.now().toString();
var dto = new CreateDeviceDto(deviceId, deviceNameField.getText(), BaseEncoding.base64Url().omitPadding().encode(deviceKey), "DESKTOP", jwe.serialize(), now, now); var dto = new CreateDeviceDto(deviceId, deviceNameField.getText(), BaseEncoding.base64().encode(deviceKey), "DESKTOP", jwe.serialize(), now);
var json = toJson(dto); var json = toJson(dto);
var putDeviceReq = HttpRequest.newBuilder(deviceUri) // var putDeviceReq = HttpRequest.newBuilder(deviceUri) //
.PUT(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) // .PUT(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) //
@@ -222,8 +222,7 @@ public class SetupDeviceController implements FxController {
private record CreateDeviceDto(@JsonProperty(required = true) String id, // private record CreateDeviceDto(@JsonProperty(required = true) String id, //
@JsonProperty(required = true) String name, // @JsonProperty(required = true) String name, //
@JsonProperty(required = true) String publicKey, // @JsonProperty(required = true) String publicKey, //
@JsonProperty(defaultValue = "DESKTOP", required = true) String type, // @JsonProperty(required = true, defaultValue = "DESKTOP") String type, //
@JsonProperty @Nullable String userKey, // @JsonProperty(required = true) String userPrivateKey, //
@JsonProperty @Nullable String creationTime, // @JsonProperty(required = true) String creationTime) {}
@JsonProperty @Nullable String lastSeenTime) {}
} }