mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore unknown fields during JWT deserialization

Browse Source
This commit is contained in:
Sebastian Stenzel
2023-06-29 12:02:33 +02:00
parent fe3abcaaa8
commit b2a184bdf0
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -47,6 +47,7 @@
<dagger.version>2.45</dagger.version>
<easybind.version>2.2</easybind.version>
<guava.version>32.0.0-jre</guava.version>
<jackson.version>2.15.2</jackson.version>
<gson.version>2.10.1</gson.version>
<javafx.version>20.0.1</javafx.version>
<jwt.version>4.4.0</jwt.version>
@@ -157,6 +158,11 @@
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- EasyBind -->
<dependency>
@@ -206,7 +212,7 @@
<artifactId>dagger</artifactId>
<version>${dagger.version}</version>
</dependency>
<dependency>
<dependency> <!-- TODO replace with jackson -->
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>

3
src/main/java/module-info.java
View File

@@ -38,7 +38,8 @@ open module org.cryptomator.desktop {
requires ch.qos.logback.core;
requires com.auth0.jwt;
requires com.google.common;
requires com.google.gson;
requires com.fasterxml.jackson.databind;
requires com.google.gson; // TODO replace with jackson?
requires com.nimbusds.jose.jwt;
requires com.nulabinc.zxcvbn;
requires com.tobiasdiez.easybind;

3
src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
View File

@@ -1,6 +1,9 @@
package org.cryptomator.ui.keyloading.hub;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
// needs to be accessible by JSON decoder
@JsonIgnoreProperties(ignoreUnknown = true)
public class HubConfig {
public String clientId;

19
src/test/java/org/cryptomator/ui/keyloading/hub/HubConfigTest.java Normal file
View File

@@ -0,0 +1,19 @@
package org.cryptomator.ui.keyloading.hub;
import com.auth0.jwt.JWT;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
public class HubConfigTest {
@Test
@DisplayName("can parse JWT with unknown fields in header claim \"hub\"")
public void testParseJWTWithUnknownFields() {
var jwt = JWT.decode("eyJraWQiOiIxMjMiLCJ0eXAiOiJqd3QiLCJhbGciOiJIUzI1NiIsImh1YiI6eyJ1bmtub3duRmllbGQiOjQyLCJjbGllbnRJZCI6ImNyeXB0b21hdG9yIn19.eyJqdGkiOiI0NTYifQ.e1CStFf5fdh9ofX_6O8_LfbHfHEJZqUpuYNWz9xZp0I");
var claim = jwt.getHeaderClaim("hub");
var hubConfig = Assertions.assertDoesNotThrow(() -> claim.as(HubConfig.class));
Assertions.assertEquals("cryptomator", hubConfig.clientId);
}
}