Skip to content

Commit 053992e

Browse files
overheadhunteroverheadhunter
committed
formatting: adjusted rules, reformat project
1 parent 6d225f3 commit 053992e

File tree

13 files changed

+157
-104
lines changed

13 files changed

+157
-104
lines changed

‎backend/.idea/codeStyles/Project.xml‎

Lines changed: 26 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,28 @@
1414
import jakarta.ws.rs.core.MediaType;
1515
import org.cryptomator.hub.entities.Device;
1616
import org.cryptomator.hub.entities.VaultAccess;
17-
import org.cryptomator.hub.entities.events.*;
17+
import org.cryptomator.hub.entities.events.AuditEvent;
18+
import org.cryptomator.hub.entities.events.DeviceRegisteredEvent;
19+
import org.cryptomator.hub.entities.events.DeviceRemovedEvent;
20+
import org.cryptomator.hub.entities.events.EmergencyAccessRecoveryAbortedEvent;
21+
import org.cryptomator.hub.entities.events.EmergencyAccessRecoveryApprovedEvent;
22+
import org.cryptomator.hub.entities.events.EmergencyAccessRecoveryCompletedEvent;
23+
import org.cryptomator.hub.entities.events.EmergencyAccessRecoveryStartedEvent;
24+
import org.cryptomator.hub.entities.events.EmergencyAccessSettingsUpdatedEvent;
25+
import org.cryptomator.hub.entities.events.EmergencyAccessSetupEvent;
26+
import org.cryptomator.hub.entities.events.SettingWotUpdateEvent;
27+
import org.cryptomator.hub.entities.events.SignedWotIdEvent;
28+
import org.cryptomator.hub.entities.events.UserAccountResetEvent;
29+
import org.cryptomator.hub.entities.events.UserKeysChangeEvent;
30+
import org.cryptomator.hub.entities.events.UserSetupCodeChangeEvent;
31+
import org.cryptomator.hub.entities.events.VaultAccessGrantedEvent;
32+
import org.cryptomator.hub.entities.events.VaultCreatedEvent;
33+
import org.cryptomator.hub.entities.events.VaultKeyRetrievedEvent;
34+
import org.cryptomator.hub.entities.events.VaultMemberAddedEvent;
35+
import org.cryptomator.hub.entities.events.VaultMemberRemovedEvent;
36+
import org.cryptomator.hub.entities.events.VaultMemberUpdatedEvent;
37+
import org.cryptomator.hub.entities.events.VaultOwnershipClaimedEvent;
38+
import org.cryptomator.hub.entities.events.VaultUpdatedEvent;
1839
import org.cryptomator.hub.license.LicenseHolder;
1940
import org.eclipse.microprofile.openapi.annotations.Operation;
2041
import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn;
@@ -107,7 +128,7 @@ public List<AuditEventDto> getAllEvents(@QueryParam("startDate") Instant startDa
107128
@JsonSubTypes.Type(value = EmergencyAccessRecoveryStartedEventDto.class, name = EmergencyAccessRecoveryStartedEvent.TYPE), //
108129
@JsonSubTypes.Type(value = EmergencyAccessRecoveryApprovedEventDto.class, name = EmergencyAccessRecoveryApprovedEvent.TYPE), //
109130
@JsonSubTypes.Type(value = EmergencyAccessRecoveryCompletedEventDto.class, name = EmergencyAccessRecoveryCompletedEvent.TYPE), //
110-
@JsonSubTypes.Type(value = EmergencyAccessRecoveryAbortedEventDto.class, name = EmergencyAccessRecoveryAbortedEvent.TYPE), //
131+
@JsonSubTypes.Type(value = EmergencyAccessRecoveryAbortedEventDto.class, name = EmergencyAccessRecoveryAbortedEvent.TYPE), //
111132
})
112133
public interface AuditEventDto {
113134

@@ -119,27 +140,23 @@ public interface AuditEventDto {
119140

120141
static AuditEventDto fromEntity(AuditEvent entity) {
121142
return switch (entity) {
122-
case DeviceRegisteredEvent evt ->
123-
new DeviceRegisteredEventDto(evt.getId(), evt.getTimestamp(), DeviceRegisteredEvent.TYPE, evt.getRegisteredBy(), evt.getDeviceId(), evt.getDeviceName(), evt.getDeviceType());
143+
case DeviceRegisteredEvent evt -> new DeviceRegisteredEventDto(evt.getId(), evt.getTimestamp(), DeviceRegisteredEvent.TYPE, evt.getRegisteredBy(), evt.getDeviceId(), evt.getDeviceName(), evt.getDeviceType());
124144
case DeviceRemovedEvent evt -> new DeviceRemovedEventDto(evt.getId(), evt.getTimestamp(), DeviceRemovedEvent.TYPE, evt.getRemovedBy(), evt.getDeviceId());
125145
case SignedWotIdEvent evt -> new SignedWotIdEventDto(evt.getId(), evt.getTimestamp(), SignedWotIdEvent.TYPE, evt.getUserId(), evt.getSignerId(), evt.getSignerKey(), evt.getSignature());
126146
case SettingWotUpdateEvent evt -> new SettingWotUpdateEventDto(evt.getId(), evt.getTimestamp(), SettingWotUpdateEvent.TYPE, evt.getUpdatedBy(), evt.getWotMaxDepth(), evt.getWotIdVerifyLen());
127147
case UserAccountResetEvent evt -> new UserAccountResetEventDto(evt.getId(), evt.getTimestamp(), UserAccountResetEvent.TYPE, evt.getResetBy());
128148
case UserKeysChangeEvent evt -> new UserKeysChangeEventDto(evt.getId(), evt.getTimestamp(), UserKeysChangeEvent.TYPE, evt.getChangedBy(), evt.getUserName());
129149
case UserSetupCodeChangeEvent evt -> new UserSetupCodeChangeEventDto(evt.getId(), evt.getTimestamp(), UserSetupCodeChangeEvent.TYPE, evt.getChangedBy());
130150
case VaultCreatedEvent evt -> new VaultCreatedEventDto(evt.getId(), evt.getTimestamp(), VaultCreatedEvent.TYPE, evt.getCreatedBy(), evt.getVaultId(), evt.getVaultName(), evt.getVaultDescription());
131-
case VaultUpdatedEvent evt ->
132-
new VaultUpdatedEventDto(evt.getId(), evt.getTimestamp(), VaultUpdatedEvent.TYPE, evt.getUpdatedBy(), evt.getVaultId(), evt.getVaultName(), evt.getVaultDescription(), evt.isVaultArchived());
151+
case VaultUpdatedEvent evt -> new VaultUpdatedEventDto(evt.getId(), evt.getTimestamp(), VaultUpdatedEvent.TYPE, evt.getUpdatedBy(), evt.getVaultId(), evt.getVaultName(), evt.getVaultDescription(), evt.isVaultArchived());
133152
case VaultAccessGrantedEvent evt -> new VaultAccessGrantedEventDto(evt.getId(), evt.getTimestamp(), VaultAccessGrantedEvent.TYPE, evt.getGrantedBy(), evt.getVaultId(), evt.getAuthorityId());
134-
case VaultKeyRetrievedEvent evt ->
135-
new VaultKeyRetrievedEventDto(evt.getId(), evt.getTimestamp(), VaultKeyRetrievedEvent.TYPE, evt.getRetrievedBy(), evt.getVaultId(), evt.getResult(), evt.getIpAddress(), evt.getDeviceId());
153+
case VaultKeyRetrievedEvent evt -> new VaultKeyRetrievedEventDto(evt.getId(), evt.getTimestamp(), VaultKeyRetrievedEvent.TYPE, evt.getRetrievedBy(), evt.getVaultId(), evt.getResult(), evt.getIpAddress(), evt.getDeviceId());
136154
case VaultMemberAddedEvent evt -> new VaultMemberAddedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberAddedEvent.TYPE, evt.getAddedBy(), evt.getVaultId(), evt.getAuthorityId(), evt.getRole());
137155
case VaultMemberRemovedEvent evt -> new VaultMemberRemovedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberRemovedEvent.TYPE, evt.getRemovedBy(), evt.getVaultId(), evt.getAuthorityId());
138-
case VaultMemberUpdatedEvent evt ->
139-
new VaultMemberUpdatedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberUpdatedEvent.TYPE, evt.getUpdatedBy(), evt.getVaultId(), evt.getAuthorityId(), evt.getRole());
156+
case VaultMemberUpdatedEvent evt -> new VaultMemberUpdatedEventDto(evt.getId(), evt.getTimestamp(), VaultMemberUpdatedEvent.TYPE, evt.getUpdatedBy(), evt.getVaultId(), evt.getAuthorityId(), evt.getRole());
140157
case VaultOwnershipClaimedEvent evt -> new VaultOwnershipClaimedEventDto(evt.getId(), evt.getTimestamp(), VaultOwnershipClaimedEvent.TYPE, evt.getClaimedBy(), evt.getVaultId());
141-
case EmergencyAccessSetupEvent evt -> new EmergencyAccessSetupEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessSetupEvent.TYPE, evt.getVaultId() ,evt.getOwnerId(), evt.getSettings(), evt.getIpAddress());
142-
case EmergencyAccessSettingsUpdatedEvent evt -> new EmergencyAccessSettingsUpdatedEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessSettingsUpdatedEvent.TYPE, evt.getAdminId(), evt.isEmergencyAccessEnabled(), evt.getCouncilMemberIds(), evt.getRequiredKeyShares(), evt.getMinMembers(), evt.isAllowChoosingCouncil());
158+
case EmergencyAccessSetupEvent evt -> new EmergencyAccessSetupEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessSetupEvent.TYPE, evt.getVaultId(), evt.getOwnerId(), evt.getSettings(), evt.getIpAddress());
159+
case EmergencyAccessSettingsUpdatedEvent evt -> new EmergencyAccessSettingsUpdatedEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessSettingsUpdatedEvent.TYPE, evt.getAdminId(), evt.isEmergencyAccessEnabled(), evt.getCouncilMemberIds(), evt.getRequiredKeyShares(), evt.getMinMembers(), evt.isAllowChoosingCouncil());
143160
case EmergencyAccessRecoveryStartedEvent evt -> new EmergencyAccessRecoveryStartedEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessRecoveryStartedEvent.TYPE, evt.getVaultId(), evt.getProcessId(), evt.getCouncilMemberId(), evt.getProcessType(), evt.getDetails());
144161
case EmergencyAccessRecoveryApprovedEvent evt -> new EmergencyAccessRecoveryApprovedEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessRecoveryApprovedEvent.TYPE, evt.getProcessId(), evt.getCouncilMemberId(), evt.getIpAddress());
145162
case EmergencyAccessRecoveryCompletedEvent evt -> new EmergencyAccessRecoveryCompletedEventDto(evt.getId(), evt.getTimestamp(), EmergencyAccessRecoveryCompletedEvent.TYPE, evt.getProcessId(), evt.getCouncilMemberId(), evt.getIpAddress());
@@ -208,8 +225,10 @@ record EmergencyAccessSetupEventDto(long id, Instant timestamp, String type, @Js
208225
@JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
209226
}
210227

211-
record EmergencyAccessSettingsUpdatedEventDto(long id, Instant timestamp, String type, @JsonProperty("adminId") String adminId,@JsonProperty("enableEmergencyAccess") boolean enableEmergencyAccess, @JsonProperty("councilMemberIds") String councilMemberIds,
212-
@JsonProperty("requiredKeyShares") int requiredKeyShares, @JsonProperty("minMembers") int minMembers, @JsonProperty("allowChoosingCouncil") boolean allowChoosingCouncil) implements AuditEventDto {
228+
record EmergencyAccessSettingsUpdatedEventDto(long id, Instant timestamp, String type, @JsonProperty("adminId") String adminId, @JsonProperty("enableEmergencyAccess") boolean enableEmergencyAccess,
229+
@JsonProperty("councilMemberIds") String councilMemberIds,
230+
@JsonProperty("requiredKeyShares") int requiredKeyShares, @JsonProperty("minMembers") int minMembers,
231+
@JsonProperty("allowChoosingCouncil") boolean allowChoosingCouncil) implements AuditEventDto {
213232
}
214233

215234
record EmergencyAccessRecoveryStartedEventDto(long id, Instant timestamp, String type, @JsonProperty("vaultId") UUID vaultId, @JsonProperty("processId") UUID processId,
@@ -221,10 +240,12 @@ record EmergencyAccessRecoveryApprovedEventDto(long id, Instant timestamp, Strin
221240
@JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
222241
}
223242

224-
record EmergencyAccessRecoveryCompletedEventDto(long id, Instant timestamp, String type, @JsonProperty("processId") UUID processId, @JsonProperty("councilMemberId") String councilMemberId, @JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
243+
record EmergencyAccessRecoveryCompletedEventDto(long id, Instant timestamp, String type, @JsonProperty("processId") UUID processId, @JsonProperty("councilMemberId") String councilMemberId,
244+
@JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
225245
}
226246

227-
record EmergencyAccessRecoveryAbortedEventDto(long id, Instant timestamp, String type, @JsonProperty("vaultId") UUID vaultId, @JsonProperty("processId") UUID processId, @JsonProperty("councilMemberId") String councilMemberId, @JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
247+
record EmergencyAccessRecoveryAbortedEventDto(long id, Instant timestamp, String type, @JsonProperty("vaultId") UUID vaultId, @JsonProperty("processId") UUID processId,
248+
@JsonProperty("councilMemberId") String councilMemberId, @JsonProperty("ipAddress") String ipAddress) implements AuditEventDto {
228249
}
229250

230251
}

‎backend/src/main/java/org/cryptomator/hub/api/EmergencyAccessResource.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ public static RecoveryProcessDto fromEntity(EmergencyRecoveryProcess entity) {
203203
}
204204

205205
@JsonInclude(JsonInclude.Include.NON_NULL)
206-
public record RecoveredKeyShareDto(@JsonProperty("processPrivateKey") @ValidJWE String processPrivateKey, @JsonProperty("unrecoveredKeyShare") @ValidJWE String unrecoveredKeyShare, @JsonProperty("recoveredKeyShare") @ValidJWE String recoveredKeyShare, @JsonProperty("signedProcessInfo") @ValidJWS String signedProcessInfo) {
206+
public record RecoveredKeyShareDto(@JsonProperty("processPrivateKey") @ValidJWE String processPrivateKey, @JsonProperty("unrecoveredKeyShare") @ValidJWE String unrecoveredKeyShare,
207+
@JsonProperty("recoveredKeyShare") @ValidJWE String recoveredKeyShare, @JsonProperty("signedProcessInfo") @ValidJWS String signedProcessInfo) {
207208

208209
public static RecoveredKeyShareDto fromEntity(RecoveredEmergencyKeyShares entity) {
209210
return new RecoveredKeyShareDto(entity.getProcessPrivateKey(), entity.getUnrecoveredKeyShare(), entity.getRecoveredKeyShare(), entity.getSignedProcessInfo());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ public Response put(@NotNull @Valid SettingsDto dto) {
7474
if (oldWotMaxDepth != dto.wotMaxDepth || oldWotIdVerifyLen != dto.wotIdVerifyLen) {
7575
eventLogger.logWotSettingUpdated(jwt.getSubject(), dto.wotIdVerifyLen, dto.wotMaxDepth);
7676
}
77-
if (!oldEmergencyCouncilMemberIds.containsAll(dto.emergencyCouncilMemberIds)
78-
|| !dto.emergencyCouncilMemberIds.containsAll(oldEmergencyCouncilMemberIds)
79-
|| oldRequiredEmergencyKeyShares != dto.defaultRequiredEmergencyKeyShares
80-
|| oldAllowChoosingEmergencyCouncil != dto.allowChoosingEmergencyCouncil
81-
|| oldMinMembers != dto.defaultMinMembers
82-
|| oldEmergencyAccessEnabled != dto.enableEmergencyAccess) {
77+
if (!oldEmergencyCouncilMemberIds.containsAll(dto.emergencyCouncilMemberIds)
78+
|| !dto.emergencyCouncilMemberIds.containsAll(oldEmergencyCouncilMemberIds)
79+
|| oldRequiredEmergencyKeyShares != dto.defaultRequiredEmergencyKeyShares
80+
|| oldAllowChoosingEmergencyCouncil != dto.allowChoosingEmergencyCouncil
81+
|| oldMinMembers != dto.defaultMinMembers
82+
|| oldEmergencyAccessEnabled != dto.enableEmergencyAccess) {
8383
var councilMemberIds = "[" + dto.emergencyCouncilMemberIds.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(", ")) + "]";
8484
eventLogger.logEmergencyAccessSettingsUpdated(jwt.getSubject(), dto.enableEmergencyAccess, councilMemberIds, dto.defaultRequiredEmergencyKeyShares, dto.defaultMinMembers, dto.allowChoosingEmergencyCouncil);
8585
}

‎backend/src/main/java/org/cryptomator/hub/api/VaultResource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Response setDirectMembers(@PathParam("vaultId") UUID vaultId, @NotEmpty M
207207
assert memberRoles.containsKey(authority.getId());
208208
return VaultAccess.create(vault, authority, memberRoles.get(authority.getId()));
209209
}).toList();
210-
if (newVaultAccess.isEmpty()){
210+
if (newVaultAccess.isEmpty()) {
211211
throw new BadRequestException("No (valid) members given.");
212212
}
213213
var oldVaultAccess = vaultAccessRepo.forVault(vaultId).toList();
@@ -252,7 +252,6 @@ public Response setDirectMembers(@PathParam("vaultId") UUID vaultId, @NotEmpty M
252252
}
253253

254254

255-
256255
@PUT
257256
@Path("/{vaultId}/users/{userId}")
258257
@RolesAllowed("user")

‎backend/src/main/java/org/cryptomator/hub/entities/Settings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void setDefaultRequiredEmergencyKeyShares(int defaultRequiredEmergencyKey
119119

120120
public void setDefaultMinMembers(int defaultMinMembers) {
121121
this.defaultMinMembers = defaultMinMembers;
122-
}
122+
}
123123

124124
public boolean isAllowChoosingEmergencyCouncil() {
125125
return allowChoosingEmergencyCouncil;

‎backend/src/main/java/org/cryptomator/hub/entities/events/EmergencyAccessRecoveryAbortedEvent.java‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,65 @@
1313
@DiscriminatorValue(EmergencyAccessRecoveryAbortedEvent.TYPE)
1414
public class EmergencyAccessRecoveryAbortedEvent extends AuditEvent {
1515

16-
public static final String TYPE = "EMERGENCY_ACCESS_RECOVERY_ABORTED";
17-
18-
@Column(name = "vault_id", nullable = false)
19-
private UUID vaultId;
20-
21-
@Column(name = "process_id", nullable = false)
22-
private UUID processId;
23-
24-
@Column(name = "council_member_id", nullable = false)
25-
private String councilMemberId;
26-
27-
@Column(name = "ip_address")
28-
private String ipAddress;
29-
30-
public UUID getVaultId() {
31-
return vaultId;
32-
}
33-
34-
public void setVaultId(UUID vaultId) {
35-
this.vaultId = vaultId;
36-
}
37-
38-
public UUID getProcessId() {
39-
return processId;
40-
}
41-
42-
public void setProcessId(UUID processId) {
43-
this.processId = processId;
44-
}
45-
46-
public String getCouncilMemberId() {
47-
return councilMemberId;
48-
}
49-
50-
public void setCouncilMemberId(String councilMemberId) {
51-
this.councilMemberId = councilMemberId;
52-
}
53-
54-
public String getIpAddress() {
55-
return ipAddress;
56-
}
57-
58-
public void setIpAddress(String ipAddress) {
59-
this.ipAddress = ipAddress;
60-
}
61-
62-
@Override
63-
public boolean equals(Object o) {
64-
if (o == null || getClass() != o.getClass()) return false;
65-
if (!super.equals(o)) return false;
66-
EmergencyAccessRecoveryAbortedEvent other = (EmergencyAccessRecoveryAbortedEvent) o;
67-
return Objects.equals(vaultId, other.vaultId)
68-
&& Objects.equals(processId, other.processId)
69-
&& Objects.equals(councilMemberId, other.councilMemberId)
70-
&& Objects.equals(ipAddress, other.ipAddress);
71-
}
72-
73-
@Override
74-
public int hashCode() {
75-
return Objects.hash(super.hashCode(), vaultId, processId, councilMemberId, ipAddress);
76-
}
16+
public static final String TYPE = "EMERGENCY_ACCESS_RECOVERY_ABORTED";
17+
18+
@Column(name = "vault_id", nullable = false)
19+
private UUID vaultId;
20+
21+
@Column(name = "process_id", nullable = false)
22+
private UUID processId;
23+
24+
@Column(name = "council_member_id", nullable = false)
25+
private String councilMemberId;
26+
27+
@Column(name = "ip_address")
28+
private String ipAddress;
29+
30+
public UUID getVaultId() {
31+
return vaultId;
32+
}
33+
34+
public void setVaultId(UUID vaultId) {
35+
this.vaultId = vaultId;
36+
}
37+
38+
public UUID getProcessId() {
39+
return processId;
40+
}
41+
42+
public void setProcessId(UUID processId) {
43+
this.processId = processId;
44+
}
45+
46+
public String getCouncilMemberId() {
47+
return councilMemberId;
48+
}
49+
50+
public void setCouncilMemberId(String councilMemberId) {
51+
this.councilMemberId = councilMemberId;
52+
}
53+
54+
public String getIpAddress() {
55+
return ipAddress;
56+
}
57+
58+
public void setIpAddress(String ipAddress) {
59+
this.ipAddress = ipAddress;
60+
}
61+
62+
@Override
63+
public boolean equals(Object o) {
64+
if (o == null || getClass() != o.getClass()) return false;
65+
if (!super.equals(o)) return false;
66+
EmergencyAccessRecoveryAbortedEvent other = (EmergencyAccessRecoveryAbortedEvent) o;
67+
return Objects.equals(vaultId, other.vaultId)
68+
&& Objects.equals(processId, other.processId)
69+
&& Objects.equals(councilMemberId, other.councilMemberId)
70+
&& Objects.equals(ipAddress, other.ipAddress);
71+
}
72+
73+
@Override
74+
public int hashCode() {
75+
return Objects.hash(super.hashCode(), vaultId, processId, councilMemberId, ipAddress);
76+
}
7777
}

0 commit comments

Comments
 (0)