Skip to content

Commit

Permalink
Merge branch 'develop' into feature/esm
Browse files Browse the repository at this point in the history
  • Loading branch information
overheadhunter committed Aug 23, 2024
2 parents 22f82b7 + bd3c5dd commit 3e464bc
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 8 deletions.
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/cryptomator/hub/compare/1.3.4...HEAD)

### Added

- This CHANGELOG file
- WoT: Users will now have an ECDH as well as ECDSA key (#282)
- WoT: Users can now mutually verify their identity, hardening Hub against injection of malicious public keys (#281)

### Changed

- Updated Keycloak to 25.0.4
- Updated to Java 21 (#272)
- Updated to Quarkus 3.8.x LTS (#272)
- Bumpd build time dependencies
- Migrated remaining commonjs modules in frontend build to ESM
- Memoize infrequently changing data, reducing XHR roundtrips
- Switched to JWK thumbprint format in user profile
- Switched to Repository Pattern (#273)

### Fixed

- Fixed incorrect ARIA roles improving accessibility

### Security

- CVE-2023-45133: Babel vulnerable to arbitrary code execution when compiling specifically crafted malicious code
- CVE-2024-4068: Uncontrolled resource consumption in braces
- CVE-2024-39338: Server-Side Request Forgery in axios

2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ hub.keycloak.oidc.cryptomator-client-id=cryptomator
%dev.quarkus.keycloak.devservices.start-command=start-dev
%dev.quarkus.keycloak.devservices.port=8180
%dev.quarkus.keycloak.devservices.service-name=quarkus-cryptomator-hub
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:25.0.1
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:25.0.4
%dev.quarkus.oidc.devui.grant.type=code
# OIDC will be mocked during unit tests. Use fake auth url to prevent dev services to start:
%test.quarkus.oidc.auth-server-url=http://localhost:43210/dev/null
Expand Down
8 changes: 4 additions & 4 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"file-saver": "^2.0.5",
"jdenticon": "^3.3.0",
"jszip": "^3.10.1",
"keycloak-js": "^25.0.2",
"keycloak-js": "^25.0.4",
"miscreant": "^0.3.2",
"rfc4648": "^1.5.3",
"semver": "^7.6.3",
Expand Down
4 changes: 2 additions & 2 deletions keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/keycloak/keycloak:25.0.1 as builder
FROM quay.io/keycloak/keycloak:25.0.4 as builder
ENV KC_HEALTH_ENABLED=true
ENV KC_METRICS_ENABLED=true
ENV KC_HTTP_RELATIVE_PATH=/kc
Expand All @@ -11,7 +11,7 @@ FROM registry.access.redhat.com/ubi9 AS ubi-micro-build
RUN mkdir -p /mnt/rootfs
RUN dnf install --installroot /mnt/rootfs curl --releasever 9 --setopt install_weak_deps=false --nodocs -y; dnf --installroot /mnt/rootfs clean all

FROM quay.io/keycloak/keycloak:25.0.1
FROM quay.io/keycloak/keycloak:25.0.4
LABEL maintainer="[email protected]"
COPY --from=builder /opt/keycloak/ /opt/keycloak/
COPY --from=ubi-micro-build /mnt/rootfs /
Expand Down

0 comments on commit 3e464bc

Please sign in to comment.