mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 03:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs

Browse Source 
[ci skip]
This commit is contained in:
Sebastian Stenzel
2023-07-04 15:05:22 +02:00
parent 61025de0d6
commit 496f9a9cd5
2 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
View File

@@ -72,7 +72,7 @@ public class ReceiveKeyController implements FxController {
}
/**
* STEP 1 (Request): GET user token for this vault
* STEP 1 (Request): GET vault key for this user
*/
private void requestUserToken() {
var userTokenUri = appendPath(vaultBaseUri, "/user-tokens/me");
@@ -86,7 +86,7 @@ public class ReceiveKeyController implements FxController {
}
/**
* STEP 1 (Response)
* STEP 1 (Response): GET vault key for this user
*
* @param response Response
*/
@@ -106,29 +106,29 @@ public class ReceiveKeyController implements FxController {
}
/**
* STEP 2 (Request): GET device token for this user
* STEP 2 (Request): GET user key for this device
*/
private void requestDeviceToken(String userToken) {
private void requestDeviceToken(String encryptedVaultKey) {
var deviceTokenUri = appendPath(URI.create(hubConfig.devicesResourceUrl), "/%s/device-token".formatted(deviceId));
var request = HttpRequest.newBuilder(deviceTokenUri) //
.header("Authorization", "Bearer " + bearerToken) //
.GET() //
.build();
httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) //
.thenAcceptAsync(response -> receivedDeviceTokenResponse(userToken, response), Platform::runLater) //
.thenAcceptAsync(response -> receivedDeviceTokenResponse(encryptedVaultKey, response), Platform::runLater) //
.exceptionally(this::retrievalFailed);
}
/**
* STEP 2 (Response)
* STEP 2 (Response): GET user key for this device
*
* @param response Response
*/
private void receivedDeviceTokenResponse(String userToken, HttpResponse<String> response) {
private void receivedDeviceTokenResponse(String encryptedVaultKey, HttpResponse<String> response) {
LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode());
try {
switch (response.statusCode()) {
case 200 -> receivedDeviceTokenSuccess(userToken, response.body());
case 200 -> receivedDeviceTokenSuccess(encryptedVaultKey, response.body());
case 403, 404 -> needsDeviceSetup();
default -> throw new IOException("Unexpected response " + response.statusCode());
}
@@ -141,11 +141,11 @@ public class ReceiveKeyController implements FxController {
window.setScene(setupDeviceScene.get());
}
private void receivedDeviceTokenSuccess(String rawUserToken, String rawDeviceToken) throws IOException {
private void receivedDeviceTokenSuccess(String encryptedVaultKey, String encryptedUserKey) throws IOException {
try {
var userToken = JWEObject.parse(rawUserToken);
var deviceToken = JWEObject.parse(rawDeviceToken);
result.complete(ReceivedKey.userAndDeviceKey(userToken, deviceToken));
var vaultKeyJwe = JWEObject.parse(encryptedVaultKey);
var userKeyJwe = JWEObject.parse(encryptedUserKey);
result.complete(ReceivedKey.vaultKeyAndUserKey(vaultKeyJwe, userKeyJwe));
window.close();
} catch (ParseException e) {
throw new IOException("Failed to parse JWE", e);
@@ -155,6 +155,7 @@ public class ReceiveKeyController implements FxController {
/**
* LEGACY FALLBACK (Request): GET the legacy access token from Hub 1.x
*/
@Deprecated
private void requestLegacyAccessToken() {
var legacyAccessTokenUri = appendPath(vaultBaseUri, "/keys/%s".formatted(deviceId));
var request = HttpRequest.newBuilder(legacyAccessTokenUri) //
@@ -171,6 +172,7 @@ public class ReceiveKeyController implements FxController {
*
* @param response Response
*/
@Deprecated
private void receivedLegacyAccessTokenResponse(HttpResponse<String> response) {
try {
switch (response.statusCode()) {
@@ -185,6 +187,7 @@ public class ReceiveKeyController implements FxController {
}
}
@Deprecated
private void receivedLegacyAccessTokenSuccess(String rawToken) throws IOException {
try {
var token = JWEObject.parse(rawToken);
@@ -199,6 +202,7 @@ public class ReceiveKeyController implements FxController {
window.setScene(invalidLicenseScene.get());
}
@Deprecated
private void needsLegacyDeviceRegistration() {
window.setScene(legacyRegisterDeviceScene.get());
}

31
src/main/java/org/cryptomator/ui/keyloading/hub/ReceivedKey.java
View File

@@ -8,17 +8,38 @@ import java.security.interfaces.ECPrivateKey;
@FunctionalInterface
interface ReceivedKey {
/**
* Decrypts the vault key.
*
* @param deviceKey This device's private key.
* @return The decrypted vault key
*/
Masterkey decryptMasterkey(ECPrivateKey deviceKey);
static ReceivedKey userAndDeviceKey(JWEObject userToken, JWEObject deviceToken) {
/**
* Creates an unlock response object from the received legacy "access token" JWE.
*
* @param vaultKeyJwe a JWE containing the symmetric vault key, encrypted for this device's user.
* @param userKeyJwe a JWE containing the user's private key, encrypted for this device.
* @return Ciphertext received by Hub, which can be decrypted using this device's private key.
*/
static ReceivedKey vaultKeyAndUserKey(JWEObject vaultKeyJwe, JWEObject userKeyJwe) {
return deviceKey -> {
var userKey = JWEHelper.decryptUserKey(deviceToken, deviceKey);
return JWEHelper.decryptVaultKey(userToken, userKey);
var userKey = JWEHelper.decryptUserKey(userKeyJwe, deviceKey);
return JWEHelper.decryptVaultKey(vaultKeyJwe, userKey);
};
}
static ReceivedKey legacyDeviceKey(JWEObject legacyAccessToken) {
return deviceKey -> JWEHelper.decryptVaultKey(legacyAccessToken, deviceKey);
/**
* Creates an unlock response object from the received legacy "access token" JWE.
*
* @param vaultKeyJwe a JWE containing the symmetric vault key, encrypted for this device.
* @return Ciphertext received by Hub, which can be decrypted using this device's private key.
* @deprecated Only for compatibility with Hub 1.0 - 1.2
*/
@Deprecated
static ReceivedKey legacyDeviceKey(JWEObject vaultKeyJwe) {
return deviceKey -> JWEHelper.decryptVaultKey(vaultKeyJwe, deviceKey);
}
}