-
-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UVF support #274
Draft
overheadhunter
wants to merge
88
commits into
develop
Choose a base branch
from
feature/uvf
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
UVF support #274
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # backend/src/test/java/org/cryptomator/hub/api/VaultResourceTest.java
# Conflicts: # backend/src/main/java/org/cryptomator/hub/api/VaultResource.java # backend/src/main/java/org/cryptomator/hub/entities/Vault.java # backend/src/test/java/org/cryptomator/hub/api/VaultResourceIT.java # frontend/src/components/VaultDetails.vue
[ci skip]
in access token
# Conflicts: # backend/src/main/java/org/cryptomator/hub/entities/User.java # backend/src/main/resources/org/cryptomator/hub/flyway/ERM.png # frontend/src/common/crypto.ts # frontend/src/components/CreateVault.vue # frontend/src/components/GrantPermissionDialog.vue # frontend/src/components/InitialSetup.vue # frontend/src/components/ManageSetupCode.vue # frontend/src/components/RecoverVaultDialog.vue # frontend/src/components/RegenerateSetupCodeDialog.vue # frontend/src/components/VaultDetails.vue # frontend/test/common/crypto.spec.ts
# Conflicts: # backend/src/main/resources/org/cryptomator/hub/flyway/ERM.png # frontend/src/common/jwt.ts # frontend/src/components/GrantPermissionDialog.vue # frontend/src/components/VaultDetails.vue # frontend/test/common/crypto.spec.ts
# Conflicts: # frontend/package-lock.json # frontend/package.json # frontend/src/common/jwe.ts # frontend/src/components/AdminSettings.vue # frontend/src/components/GrantPermissionDialog.vue # frontend/src/components/UserProfile.vue # frontend/test/common/crypto.spec.ts # frontend/test/common/jwe.spec.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds fundamental support for UVF-based vaults. During vault creation either format is selected. There is no migration of format 8 based vaults planned. Vault access tokens either contain a format 8 Masterkey OR a UVF member key (which is an A256KW key for the
vault.uvf
file).Notable changes:
uvf.ts
andvaultv8.ts
, leaving common crypto incrypto.ts
jwe.ts
capable of handling compact as well as json serialization with support forECDH-ES
(legacy, decrypt only),ECDH-ES+A256KW
,PBES2+A256KW
andA256KW
, allowing encryption for multiple recipientsvault.uvf
file as well as the public part of a recovery key pairTODO