Skip to content

Conversation

@overheadhunter
Copy link
Member

@overheadhunter overheadhunter commented Jan 9, 2026

This pull request introduces comprehensive support for emergency access and recovery features in the backend API, including new endpoints, event logging, and configuration options. The changes span multiple files to add new resource classes, extend DTOs, update audit logging, and enhance settings management.

Emergency Access and Recovery Features

  • Added the new EmergencyAccessResource REST API, which enables users to start, approve, complete, abort, and delete emergency recovery processes, as well as manage recovered key shares. This includes new DTOs for recovery processes and key shares.
  • Enhanced the audit logging system to support emergency access events by adding new event types and corresponding DTOs, updating the event conversion logic, and extending the valid event types set. [1] [2] [3] [4]

Settings and Configuration

  • Expanded the SettingsResource and SettingsDto to allow configuration of emergency access options, such as enabling/disabling emergency access, council member IDs, required key shares, minimum members, and council selection. Also added audit logging for emergency access settings changes.

User Account Management

  • Updated the user account reset logic in UsersResource to remove emergency key shares and recovery process key shares for the user, ensuring proper cleanup during account reset.

General Improvements

  • Marked AuthorityDto and its subclasses with @JsonInclude(JsonInclude.Include.NON_NULL) to avoid serializing null fields in API responses.

These changes collectively provide robust emergency access and recovery capabilities, improve auditability, and enhance configuration flexibility.

mindmonk and others added 30 commits July 9, 2025 11:36
* `vault.requiredEmergencyKeyShares`
* `vault.emergencyKeyShares`
overheadhunter and others added 22 commits December 17, 2025 11:16
# Conflicts:
#	backend/src/main/java/org/cryptomator/hub/api/UsersResource.java
#	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
#	backend/src/main/java/org/cryptomator/hub/entities/User.java
#	backend/src/main/java/org/cryptomator/hub/entities/VaultAccess.java
#	backend/src/main/java/org/cryptomator/hub/filters/VaultRole.java
#	frontend/src/common/backend.ts
#	frontend/src/components/NavigationBar.vue
#	frontend/src/router/index.ts
@overheadhunter overheadhunter added this to the 1.5.0 milestone Jan 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants