AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve error handling while verifying VaultConfig

Browse Source
This commit is contained in:
Julian Raufelder 2021-04-07 18:20:36 +02:00
parent 4a20fbf7ab
commit e34597a716
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt
View File

@ -8,11 +8,14 @@ import java.net.URI
import java.security.Key import java.security.Key
import java.util.UUID import java.util.UUID
import io.jsonwebtoken.Claims import io.jsonwebtoken.Claims
import io.jsonwebtoken.IncorrectClaimException
import io.jsonwebtoken.JwsHeader import io.jsonwebtoken.JwsHeader
import io.jsonwebtoken.JwtException import io.jsonwebtoken.JwtException
import io.jsonwebtoken.Jwts import io.jsonwebtoken.Jwts
import io.jsonwebtoken.MissingClaimException
import io.jsonwebtoken.SigningKeyResolverAdapter import io.jsonwebtoken.SigningKeyResolverAdapter
import io.jsonwebtoken.security.Keys import io.jsonwebtoken.security.Keys
import io.jsonwebtoken.security.SignatureException
import kotlin.properties.Delegates import kotlin.properties.Delegates
class VaultConfig private constructor(builder: VaultConfigBuilder) { class VaultConfig private constructor(builder: VaultConfigBuilder) {
@ -35,6 +38,7 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
} }
class VaultConfigBuilder { class VaultConfigBuilder {
internal var id: String = UUID.randomUUID().toString() internal var id: String = UUID.randomUUID().toString()
internal var vaultFormat = CryptoConstants.MAX_VAULT_VERSION; internal var vaultFormat = CryptoConstants.MAX_VAULT_VERSION;
internal var cipherCombo = VaultCipherCombo.SIV_CTRMAC internal var cipherCombo = VaultCipherCombo.SIV_CTRMAC
@ -72,6 +76,7 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
} }
companion object { companion object {
private const val JSON_KEY_VAULTFORMAT = "format" private const val JSON_KEY_VAULTFORMAT = "format"
private const val JSON_KEY_CIPHERCONFIG = "cipherCombo" private const val JSON_KEY_CIPHERCONFIG = "cipherCombo"
private const val JSON_KEY_MAXFILENAMELEN = "maxFilenameLen" private const val JSON_KEY_MAXFILENAMELEN = "maxFilenameLen"
@ -110,24 +115,24 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
.maxFilenameLength(parser.body[JSON_KEY_MAXFILENAMELEN] as Int) .maxFilenameLength(parser.body[JSON_KEY_MAXFILENAMELEN] as Int)
VaultConfig(vaultConfigBuilder) VaultConfig(vaultConfigBuilder)
/*} catch (SignatureVerificationException e) { } catch (e: Exception) {
throw new VaultKeyInvalidException(); when (e) {
} catch (InvalidClaimException e) { is MissingClaimException, is IncorrectClaimException -> throw VaultVersionMismatchException("Vault config not for version " + unverifiedVaultConfig.vaultFormat)
throw new VaultVersionMismatchException("Vault config not for version " + expectedVaultFormat); is SignatureException -> throw VaultKeyInvalidException()
} catch (JWTVerificationException e) { is JwtException -> throw VaultConfigLoadException("Failed to verify vault config", e)
throw new VaultConfigLoadException("Failed to verify vault config: " + unverifiedConfig.getToken()); else -> throw VaultConfigLoadException(e)
*/ }
} catch (e: JwtException) {
throw VaultConfigLoadException("Failed to verify vault config", e)
} }
} }
@JvmStatic
fun createVaultConfig(): VaultConfigBuilder { fun createVaultConfig(): VaultConfigBuilder {
return VaultConfigBuilder() return VaultConfigBuilder()
} }
} }
private class UnverifiedSigningKeyResolver : SigningKeyResolverAdapter() { private class UnverifiedSigningKeyResolver : SigningKeyResolverAdapter() {
lateinit var keyId: URI lateinit var keyId: URI
var vaultFormat: Int by Delegates.notNull() var vaultFormat: Int by Delegates.notNull()

5
domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/VaultConfigLoadException.java
View File

@ -13,4 +13,9 @@ public class VaultConfigLoadException extends BackendException {
public VaultConfigLoadException(String message, JwtException e) { public VaultConfigLoadException(String message, JwtException e) {
super(message, e); super(message, e);
} }
public VaultConfigLoadException(Exception e) {
super(e);
}
} }