Skip to content
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

refactored access management #207

Merged
merged 93 commits into from
Aug 22, 2023
Merged

Commits on Apr 27, 2023

  1. Configuration menu
    Copy the full SHA
    58f4260 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Configuration menu
    Copy the full SHA
    ec32f4b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1f5e7f3 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    9bb8a23 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. updated paths to obtain JWEs

    /api/vaults/{vaultId}/user-tokens/me
    /api/users/me/device-tokens/{deviceId}
    overheadhunter committed May 5, 2023
    Configuration menu
    Copy the full SHA
    497592f View commit details
    Browse the repository at this point in the history
  2. made Device.userKeyJwe nullable

    (so a device can be registered at t0 and verified at t1)
    overheadhunter committed May 5, 2023
    Configuration menu
    Copy the full SHA
    0949aa1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2a3c106 View commit details
    Browse the repository at this point in the history
  4. diversified test case

    overheadhunter committed May 5, 2023
    Configuration menu
    Copy the full SHA
    28afe35 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. moved service

    overheadhunter committed May 8, 2023
    Configuration menu
    Copy the full SHA
    074a173 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    40f4b33 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Configuration menu
    Copy the full SHA
    c6d3811 View commit details
    Browse the repository at this point in the history
  2. Allow use of validation annotations for nullable fields.

    If a field must not be null, use @NotNull additionally. The one must not imply the other.
    overheadhunter committed May 9, 2023
    Configuration menu
    Copy the full SHA
    a67f212 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Configuration menu
    Copy the full SHA
    2198602 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Configuration menu
    Copy the full SHA
    86e790d View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Configuration menu
    Copy the full SHA
    45b0968 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Configuration menu
    Copy the full SHA
    4578b3a View commit details
    Browse the repository at this point in the history
  2. added "enter recovery code" flow in SetupUserKey

    it doesn't work yet but it's probably close
    tobihagemann committed May 26, 2023
    Configuration menu
    Copy the full SHA
    274ffa6 View commit details
    Browse the repository at this point in the history
  3. deduplicated code

    tobihagemann committed May 26, 2023
    Configuration menu
    Copy the full SHA
    ed57bde View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. Configuration menu
    Copy the full SHA
    2f1afc6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    efc4cdf View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Configuration menu
    Copy the full SHA
    2ed6624 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c21c86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    740fd10 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4766afe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cfd280c View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Configuration menu
    Copy the full SHA
    11f818f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    29e45bc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9b35286 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5df9236 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f590182 View commit details
    Browse the repository at this point in the history
  6. make requests idempotent:

    * `PUT /api/vaults/{vaultId}/users/{userId}`
    * `PUT /api/vaults/{vaultId}/groups/{groupId}`
    overheadhunter committed May 31, 2023
    Configuration menu
    Copy the full SHA
    5eedc46 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c480ea4 View commit details
    Browse the repository at this point in the history
  8. further refinements

    tobihagemann committed May 31, 2023
    Configuration menu
    Copy the full SHA
    0846927 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c4c1e99 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2f7f9bc View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e549937 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Configuration menu
    Copy the full SHA
    f9199e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    601ddd9 View commit details
    Browse the repository at this point in the history
  3. rotate setup code

    overheadhunter committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    b261d48 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3afe8de View commit details
    Browse the repository at this point in the history
  5. fixed tests

    overheadhunter committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    2ab6495 View commit details
    Browse the repository at this point in the history
  6. fix code smells

    overheadhunter committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    9f15d3f View commit details
    Browse the repository at this point in the history
  7. Merge commit 'a2822b65f79616ca0f08481aad0bb7cdd3700857' into feature/…

    …refactored-access-grant
    
    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/AuthorityResource.java
    #	backend/src/main/java/org/cryptomator/hub/api/DeviceResource.java
    #	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
    #	backend/src/main/java/org/cryptomator/hub/entities/Authority.java
    #	backend/src/main/java/org/cryptomator/hub/entities/Vault.java
    #	backend/src/test/java/org/cryptomator/hub/api/DeviceResourceTest.java
    #	backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql
    #	frontend/src/components/NavigationBar.vue
    overheadhunter committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    ee58ae2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1f833d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Configuration menu
    Copy the full SHA
    06d9d8c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c5008c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6e2112a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    115aae3 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Configuration menu
    Copy the full SHA
    3b5003d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6cdc62 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f6534e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/DeviceResource.java
    #	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/Device.java
    #	backend/src/test/java/org/cryptomator/hub/api/DeviceResourceTest.java
    #	backend/src/test/java/org/cryptomator/hub/api/VaultResourceTest.java
    #	backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql
    #	frontend/src/common/backend.ts
    #	frontend/src/components/DeviceList.vue
    #	frontend/src/components/UserProfile.vue
    #	frontend/src/i18n/de-DE.json
    #	frontend/src/i18n/en-US.json
    overheadhunter committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    05d0d9a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7973b93 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9fc2b17 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e935311 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c32c832 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f5a335d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    54156b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Fix 204 without description.

    org.openapitools.codegen.SpecValidationException: There were issues with the specification. The option can be disabled via validateSpec (Maven/Gradle) or --skip-validate-spec (CLI).
     | Error count: 1, Warning count: 0
    Errors: 
    	-attribute paths.'/api/billing/token'(put).responses.204.description is missing
    chenkins authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    eb63a93 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #204 from chenkins/feature/refactored-access-grant…

    …-204-without-description
    
    Fix 204 without description.
    tobihagemann authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    a621a0c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Configuration menu
    Copy the full SHA
    85e8a2f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    822d8b1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    491739a View commit details
    Browse the repository at this point in the history
  4. use base64 encoding for new devices

    (used to be base64url for legacy devices)
    overheadhunter committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    02f0419 View commit details
    Browse the repository at this point in the history
  5. API cleanup:

    * dropped `/api/devices/{deviceId}/device-token` (use `/api/devices/{deviceId}` instead)
    * renamed `/api/vaults/{vaultId}/user-token/me` → `/api/vaults/{vaultId}/access-token`
    * renamed `device.userKey` to `device.userPrivateKey`
    overheadhunter committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    700c3a6 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'develop' into feature/refactored-access-grant

    # 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/Vault.java
    #	backend/src/test/java/org/cryptomator/hub/api/VaultResourceTest.java
    #	backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql
    #	frontend/src/common/backend.ts
    #	frontend/src/components/CreateVault.vue
    #	frontend/src/components/VaultDetails.vue
    #	frontend/src/components/VaultList.vue
    #	frontend/src/i18n/de-DE.json
    #	frontend/src/i18n/en-US.json
    #	frontend/test/common/jwe.spec.ts
    overheadhunter committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    dabc2c3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    93778ee View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. Configuration menu
    Copy the full SHA
    615f9ba View commit details
    Browse the repository at this point in the history
  2. use low PBKDF2 iteration count in unit tests

    [build image]
    overheadhunter committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    5e0c281 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f41b17b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Revert changes to effective_vault_access view done in 2eb435d: Arch…

    …iving a vault should not affect membership.
    
    The archive flag should be taken into account for determining seat count. Therefore the corresponding queries have been adjusted.
    overheadhunter committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    3c3f32e View commit details
    Browse the repository at this point in the history
  2. cleanup

    overheadhunter committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    dd29e3e View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Configuration menu
    Copy the full SHA
    29bcb78 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f4d0c0d View commit details
    Browse the repository at this point in the history
  3. cleanup

    [build image]
    overheadhunter committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    51d6742 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a5b26fb View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
    #	frontend/src/common/backend.ts
    #	frontend/src/components/VaultList.vue
    #	frontend/src/i18n/de-DE.json
    #	frontend/src/i18n/en-US.json
    overheadhunter committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    57ce308 View commit details
    Browse the repository at this point in the history
  2. added inline comment

    [ci skip]
    overheadhunter committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    bf4a625 View commit details
    Browse the repository at this point in the history
  3. fixed `org.flywaydb.core.api.FlywayException: Found more than one mig…

    …ration with version 11` after merging from develop
    overheadhunter committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    a81ec97 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
    #	backend/src/test/java/org/cryptomator/hub/api/VaultResourceTest.java
    #	backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql
    #	frontend/src/common/backend.ts
    overheadhunter committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    cdd0937 View commit details
    Browse the repository at this point in the history
  2. add AuditEventVaultMemberAdd.role

    [build image]
    overheadhunter committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    0bcbc3a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Configuration menu
    Copy the full SHA
    8795fab View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java
    #	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
    overheadhunter committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    2baf0d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f88fe8 View commit details
    Browse the repository at this point in the history
  3. fix compile error

    overheadhunter committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    21264cf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bcf5dcc View commit details
    Browse the repository at this point in the history
  5. log unlock attempts

    overheadhunter committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    e9411b4 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. minor improvement displaying role

    [ci skip]
    tobihagemann committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    0bad652 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Configuration menu
    Copy the full SHA
    19faa14 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	frontend/src/common/jwe.ts
    #	frontend/test/common/jwe.spec.ts
    overheadhunter committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    52052ca View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Configuration menu
    Copy the full SHA
    963d1d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge branch 'develop' into feature/refactored-access-grant

    # Conflicts:
    #	backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java
    #	backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
    #	backend/src/test/java/org/cryptomator/hub/api/VaultResourceTest.java
    #	frontend/src/common/backend.ts
    #	frontend/src/components/VaultDetails.vue
    #	frontend/src/i18n/en-US.json
    tobihagemann committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    e55caa1 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Fix unlock, query fails due to Hibernate bug

    See quarkusio/quarkus#35386 for further information
    
    [build image]
    SailReal committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    1baf734 View commit details
    Browse the repository at this point in the history