UVF support

backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java

@@ -25,6 +25,7 @@
 import org.cryptomator.hub.entities.events.EmergencyAccessRecoveryStartedEvent;
 import org.cryptomator.hub.entities.events.EmergencyAccessSettingsUpdatedEvent;
 import org.cryptomator.hub.entities.events.EmergencyAccessSetupEvent;
+import org.cryptomator.hub.entities.events.SettingAutoGrantUpdateEvent;
 import org.cryptomator.hub.entities.events.SettingWotUpdateEvent;
 import org.cryptomator.hub.entities.events.SignedWotIdEvent;
 import org.cryptomator.hub.entities.events.UserAccountResetEvent;
@@ -53,7 +54,7 @@
 public class AuditLogResource {
 
 	private static final Set<String> EVENT_TYPES = Set.of(DeviceRegisteredEvent.TYPE, DeviceRemovedEvent.TYPE, UserAccountResetEvent.TYPE, UserKeysChangeEvent.TYPE, UserSetupCodeChangeEvent.TYPE,
-			SettingWotUpdateEvent.TYPE, SignedWotIdEvent.TYPE, VaultCreatedEvent.TYPE, VaultUpdatedEvent.TYPE, VaultAccessGrantedEvent.TYPE,
+			SettingAutoGrantUpdateEvent.TYPE, SettingWotUpdateEvent.TYPE, SignedWotIdEvent.TYPE, VaultCreatedEvent.TYPE, VaultUpdatedEvent.TYPE, VaultAccessGrantedEvent.TYPE,
 			VaultKeyRetrievedEvent.TYPE, VaultMemberAddedEvent.TYPE, VaultMemberRemovedEvent.TYPE, VaultMemberUpdatedEvent.TYPE, VaultOwnershipClaimedEvent.TYPE,
 			EmergencyAccessSetupEvent.TYPE, EmergencyAccessSettingsUpdatedEvent.TYPE, EmergencyAccessRecoveryStartedEvent.TYPE, EmergencyAccessRecoveryApprovedEvent.TYPE, EmergencyAccessRecoveryCompletedEvent.TYPE, EmergencyAccessRecoveryAbortedEvent.TYPE);
 
@@ -118,6 +119,7 @@ public List<AuditEventDto> getAllEvents(@QueryParam("startDate") Instant startDa
 	@JsonSubTypes({ //
 			@JsonSubTypes.Type(value = DeviceRegisteredEventDto.class, name = DeviceRegisteredEvent.TYPE), //
 			@JsonSubTypes.Type(value = DeviceRemovedEventDto.class, name = DeviceRemovedEvent.TYPE), //
+			@JsonSubTypes.Type(value = SettingAutoGrantUpdateEventDto.class, name = SettingAutoGrantUpdateEvent.TYPE), //
 			@JsonSubTypes.Type(value = SettingWotUpdateEventDto.class, name = SettingWotUpdateEvent.TYPE), //
 			@JsonSubTypes.Type(value = SignedWotIdEventDto.class, name = SignedWotIdEvent.TYPE), //
 			@JsonSubTypes.Type(value = UserAccountResetEventDto.class, name = UserAccountResetEvent.TYPE), //
@@ -151,13 +153,14 @@ static AuditEventDto fromEntity(AuditEvent entity) {
 				case DeviceRegisteredEvent evt -> new DeviceRegisteredEventDto(evt.getId(), evt.getTimestamp(), DeviceRegisteredEvent.TYPE, evt.getRegisteredBy(), evt.getDeviceId(), evt.getDeviceName(), evt.getDeviceType());
 				case DeviceRemovedEvent evt -> new DeviceRemovedEventDto(evt.getId(), evt.getTimestamp(), DeviceRemovedEvent.TYPE, evt.getRemovedBy(), evt.getDeviceId());
 				case SignedWotIdEvent evt -> new SignedWotIdEventDto(evt.getId(), evt.getTimestamp(), SignedWotIdEvent.TYPE, evt.getUserId(), evt.getSignerId(), evt.getSignerKey(), evt.getSignature());
+				case SettingAutoGrantUpdateEvent evt -> new SettingAutoGrantUpdateEventDto(evt.getId(), evt.getTimestamp(), SettingAutoGrantUpdateEvent.TYPE, evt.getUpdatedBy(), evt.isEnabled(), evt.getTrustThreshold(), evt.isAllowOverride());
 				case SettingWotUpdateEvent evt -> new SettingWotUpdateEventDto(evt.getId(), evt.getTimestamp(), SettingWotUpdateEvent.TYPE, evt.getUpdatedBy(), evt.getWotMaxDepth(), evt.getWotIdVerifyLen());
 				case UserAccountResetEvent evt -> new UserAccountResetEventDto(evt.getId(), evt.getTimestamp(), UserAccountResetEvent.TYPE, evt.getResetBy());
 				case UserKeysChangeEvent evt -> new UserKeysChangeEventDto(evt.getId(), evt.getTimestamp(), UserKeysChangeEvent.TYPE, evt.getChangedBy(), evt.getUserName());
 				case UserSetupCodeChangeEvent evt -> new UserSetupCodeChangeEventDto(evt.getId(), evt.getTimestamp(), UserSetupCodeChangeEvent.TYPE, evt.getChangedBy());
 				case VaultCreatedEvent evt -> new VaultCreatedEventDto(evt.getId(), evt.getTimestamp(), VaultCreatedEvent.TYPE, evt.getCreatedBy(), evt.getVaultId(), evt.getVaultName(), evt.getVaultDescription());
 				case VaultUpdatedEvent evt -> new VaultUpdatedEventDto(evt.getId(), evt.getTimestamp(), VaultUpdatedEvent.TYPE, evt.getUpdatedBy(), evt.getVaultId(), evt.getVaultName(), evt.getVaultDescription(), evt.isVaultArchived());
-				case VaultAccessGrantedEvent evt -> new VaultAccessGrantedEventDto(evt.getId(), evt.getTimestamp(), VaultAccessGrantedEvent.TYPE, evt.getGrantedBy(), evt.getVaultId(), evt.getAuthorityId());
+				case VaultAccessGrantedEvent evt -> new VaultAccessGrantedEventDto(evt.getId(), evt.getTimestamp(), VaultAccessGrantedEvent.TYPE, evt.getGrantedBy(), evt.getVaultId(), evt.getAuthorityId(), evt.isAutomatic());
 				case VaultKeyRetrievedEvent evt -> new VaultKeyRetrievedEventDto(evt.getId(), evt.getTimestamp(), VaultKeyRetrievedEvent.TYPE, evt.getRetrievedBy(), evt.getVaultId(), evt.getResult(), evt.getIpAddress(), evt.getDeviceId());
 				case VaultMemberAddedEvent evt -> new VaultMemberAddedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberAddedEvent.TYPE, evt.getAddedBy(), evt.getVaultId(), evt.getAuthorityId(), evt.getRole());
 				case VaultMemberRemovedEvent evt -> new VaultMemberRemovedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberRemovedEvent.TYPE, evt.getRemovedBy(), evt.getVaultId(), evt.getAuthorityId());
@@ -185,6 +188,10 @@ record SignedWotIdEventDto(long id, Instant timestamp, String type, @JsonPropert
 							   @JsonProperty("signature") String signature) implements AuditEventDto {
 	}
 
+	record SettingAutoGrantUpdateEventDto(long id, Instant timestamp, String type, @JsonProperty("updatedBy") String updatedBy, @JsonProperty("enabled") boolean enabled,
+										  @JsonProperty("trustThreshold") int trustThreshold, @JsonProperty("allowOverride") boolean allowOverride) implements AuditEventDto {
+	}
+
 	record SettingWotUpdateEventDto(long id, Instant timestamp, String type, @JsonProperty("updatedBy") String updatedBy, @JsonProperty("wotMaxDepth") int wotMaxDepth,
 									@JsonProperty("wotIdVerifyLen") int wotIdVerifyLen) implements AuditEventDto {
 	}
@@ -207,7 +214,7 @@ record VaultUpdatedEventDto(long id, Instant timestamp, String type, @JsonProper
 	}
 
 	record VaultAccessGrantedEventDto(long id, Instant timestamp, String type, @JsonProperty("grantedBy") String grantedBy, @JsonProperty("vaultId") UUID vaultId,
-									  @JsonProperty("authorityId") String authorityId) implements AuditEventDto {
+									  @JsonProperty("authorityId") String authorityId, @JsonProperty("automatic") boolean automatic) implements AuditEventDto {
 	}
 
 	record VaultKeyRetrievedEventDto(long id, Instant timestamp, String type, @JsonProperty("retrievedBy") String retrievedBy, @JsonProperty("vaultId") UUID vaultId,

backend/src/main/java/org/cryptomator/hub/api/ConfigResource.java

@@ -21,6 +21,19 @@
 @AvailableDuringSetup
 public class ConfigResource {
 
+	/**
+	 * Advertised to clients via {@link ConfigDto#apiLevel()} so they can detect the capabilities of this Hub instance.
+	 * <ul>
+	 *     <li>0: initial</li>
+	 *     <li>1: new unlock flow via {@code /devices/{deviceId}} (Hub 1.3.0)</li>
+	 *     <li>2: Hub 1.3.0 sent a response header that was missing before</li>
+	 *     <li>3: HTTP 402 Payment Required on exceeded seats (Hub 1.3.4)</li>
+	 *     <li>4: Hub 1.4.0</li>
+	 *     <li>5: Universal Vault Format: {@code /vaults/{vaultId}/uvf/*}, access tokens may contain a UVF member key</li>
+	 * </ul>
+	 */
+	static final int API_LEVEL = 5;
+
 	private final String keycloakPublicUrl;
 	private final String keycloakRealm;
 	private final String keycloakClientIdHub;
@@ -61,7 +74,7 @@ public ConfigDto getConfig() {
 		var authUri = replacePrefix(oidcConfData.getAuthorizationUri(), trimTrailingSlash(internalRealmUrl), publicRealmUri);
 		var tokenUri = replacePrefix(oidcConfData.getTokenUri(), trimTrailingSlash(internalRealmUrl), publicRealmUri);
 
-		return new ConfigDto(keycloakPublicUrl, keycloakRealm, keycloakClientIdHub, keycloakClientIdCryptomator, authUri, tokenUri, Instant.now().truncatedTo(ChronoUnit.MILLIS), 4, license.getEntitlements(), billingUrl, licenseApiUrl, license.isSetupRequired());
+		return new ConfigDto(keycloakPublicUrl, keycloakRealm, keycloakClientIdHub, keycloakClientIdCryptomator, authUri, tokenUri, Instant.now().truncatedTo(ChronoUnit.MILLIS), API_LEVEL, license.getEntitlements(), billingUrl, licenseApiUrl, license.isSetupRequired());
 	}
 
 	//visible for testing

backend/src/main/java/org/cryptomator/hub/api/SettingsResource.java

@@ -65,13 +65,19 @@ public Response put(@NotNull @Valid SettingsDto dto) {
 		var oldMinMembers = settings.getDefaultMinMembers();
 		var oldAllowChoosingEmergencyCouncil = settings.isAllowChoosingEmergencyCouncil();
 		var oldEmergencyAccessEnabled = settings.isEmergencyAccessEnabled();
+		var oldAutoGrantEnabled = settings.isAutomaticAccessGrantEnabled();
+		var oldAutoGrantTrustThreshold = settings.getAutomaticAccessGrantTrustThreshold();
+		var oldAutoGrantAllowOverride = settings.isAllowAutomaticAccessGrantOverride();
 		settings.setWotMaxDepth(dto.wotMaxDepth);
 		settings.setWotIdVerifyLen(dto.wotIdVerifyLen);
 		settings.setDefaultRequiredEmergencyKeyShares(dto.defaultRequiredEmergencyKeyShares);
 		settings.setDefaultMinMembers(dto.defaultMinMembers);
 		settings.setAllowChoosingEmergencyCouncil(dto.allowChoosingEmergencyCouncil);
 		settings.setEmergencyCouncilMemberIds(dto.emergencyCouncilMemberIds);
 		settings.setEmergencyAccessEnabled(dto.enableEmergencyAccess);
+		settings.setAutomaticAccessGrantEnabled(dto.enableAutomaticAccessGrant);
+		settings.setAutomaticAccessGrantTrustThreshold(dto.automaticAccessGrantTrustThreshold);
+		settings.setAllowAutomaticAccessGrantOverride(dto.allowAutomaticAccessGrantOverride);
 		settingsRepo.persist(settings);
 		if (oldWotMaxDepth != dto.wotMaxDepth || oldWotIdVerifyLen != dto.wotIdVerifyLen) {
 			eventLogger.logWotSettingUpdated(jwt.getSubject(), dto.wotIdVerifyLen, dto.wotMaxDepth);
@@ -85,6 +91,11 @@ public Response put(@NotNull @Valid SettingsDto dto) {
 			var councilMemberIds = "[" + dto.emergencyCouncilMemberIds.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(", ")) + "]";
 			eventLogger.logEmergencyAccessSettingsUpdated(jwt.getSubject(), dto.enableEmergencyAccess, councilMemberIds, dto.defaultRequiredEmergencyKeyShares, dto.defaultMinMembers, dto.allowChoosingEmergencyCouncil);
 		}
+		if (oldAutoGrantEnabled != dto.enableAutomaticAccessGrant
+				|| oldAutoGrantTrustThreshold != dto.automaticAccessGrantTrustThreshold
+				|| oldAutoGrantAllowOverride != dto.allowAutomaticAccessGrantOverride) {
+			eventLogger.logAutoGrantSettingUpdated(jwt.getSubject(), dto.enableAutomaticAccessGrant, dto.automaticAccessGrantTrustThreshold, dto.allowAutomaticAccessGrantOverride);
+		}
 		return Response.status(Response.Status.NO_CONTENT).build();
 	}
 
@@ -95,10 +106,13 @@ public record SettingsDto(@JsonProperty("hubId") String hubId,
 							  @JsonProperty("defaultRequiredEmergencyKeyShares") @Min(0) int defaultRequiredEmergencyKeyShares,
 							  @JsonProperty("defaultMinMembers") @Min(0) int defaultMinMembers,
 							  @JsonProperty("allowChoosingEmergencyCouncil") boolean allowChoosingEmergencyCouncil,
-							  @JsonProperty("emergencyCouncilMemberIds") @NotNull Set<String> emergencyCouncilMemberIds) {
+							  @JsonProperty("emergencyCouncilMemberIds") @NotNull Set<String> emergencyCouncilMemberIds,
+							  @JsonProperty("enableAutomaticAccessGrant") boolean enableAutomaticAccessGrant,
+							  @JsonProperty("automaticAccessGrantTrustThreshold") @Min(-1) @Max(9) int automaticAccessGrantTrustThreshold,
+							  @JsonProperty("allowAutomaticAccessGrantOverride") boolean allowAutomaticAccessGrantOverride) {
 
 		public static SettingsDto fromEntity(Settings entity) {
-			return new SettingsDto(entity.getHubId(), entity.getWotMaxDepth(), entity.getWotIdVerifyLen(), entity.isEmergencyAccessEnabled(), entity.getDefaultRequiredEmergencyKeyShares(), entity.getDefaultMinMembers(), entity.isAllowChoosingEmergencyCouncil(), entity.getEmergencyCouncilMemberIds());
+			return new SettingsDto(entity.getHubId(), entity.getWotMaxDepth(), entity.getWotIdVerifyLen(), entity.isEmergencyAccessEnabled(), entity.getDefaultRequiredEmergencyKeyShares(), entity.getDefaultMinMembers(), entity.isAllowChoosingEmergencyCouncil(), entity.getEmergencyCouncilMemberIds(), entity.isAutomaticAccessGrantEnabled(), entity.getAutomaticAccessGrantTrustThreshold(), entity.isAllowAutomaticAccessGrantOverride());
 		}
 
 	}

backend/src/main/java/org/cryptomator/hub/api/UsersResource.java

@@ -164,7 +164,7 @@ public Response updateMyAccessTokens(@NotNull Map<UUID, @ValidJWE String> tokens
 			}
 			token.setVaultKey(entry.getValue());
 			accessTokenRepo.persist(token);
-			eventLogger.logVaultAccessGranted(user.getId(), vault.getId(), user.getId());
+			eventLogger.logVaultAccessGranted(user.getId(), vault.getId(), user.getId(), false);
 		}
 		return Response.ok().build();
 	}