From db0ff2c8257aa3657281b66732b4594d56c6e2b1 Mon Sep 17 00:00:00 2001 From: usbharu Date: Tue, 24 Sep 2024 11:44:56 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20v2=E3=81=AB=E3=81=82=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/httpsignature/{v2 => common}/Component.kt | 2 +- .../httpsignature/{v2 => common}/DerivedComponent.kt | 2 +- .../{v2 => common}/HttpMessageComponent.kt | 2 +- .../{v2 => common}/InstantSignatureParameter.kt | 2 +- .../{v2 => common}/LongSignatureParameter.kt | 2 +- .../usbharu/httpsignature/{v2 => common}/Signature.kt | 2 +- .../httpsignature/{v2 => common}/SignatureBase.kt | 2 +- .../{v2 => common}/SignatureBaseBuilder.kt | 2 +- .../httpsignature/{v2 => common}/SignatureParameter.kt | 2 +- .../{v2 => common}/SignatureParameters.kt | 2 +- .../{v2 => common}/StringSignatureParameter.kt | 2 +- .../{v2 => common}/StructuredFieldComponent.kt | 2 +- .../{v2 => sign}/EcdsaP256Sha256SignatureSigner.kt | 2 +- .../{v2 => sign}/HttpMessageSignatureSigner.kt | 5 ++++- .../dev/usbharu/httpsignature/{v2 => sign}/Material.kt | 3 ++- .../{v2 => sign}/RsaPssSha512SignatureSigner.kt | 2 +- .../{v2 => sign}/RsaPssSignatureSigner.kt | 2 +- .../{v2 => sign}/RsaV1_5Sha256SignatureSigner.kt | 2 +- .../httpsignature/{v2 => sign}/SignatureSigner.kt | 2 +- .../{v2 => verify}/DefaultHttpSignatureHeaderParser.kt | 6 +++++- .../{v2 => verify}/HttpMessageSignatureVerifier.kt | 3 ++- .../{v2 => verify}/HttpSignatureHeaderParser.kt | 4 +++- .../{v2 => verify}/RsaPssSha512SignatureVerifier.kt | 2 +- .../{v2 => verify}/RsaPssSignatureVerifier.kt | 2 +- .../{v2 => verify}/RsaV1_5Sha256SignatureVerifier.kt | 2 +- .../httpsignature/{v2 => verify}/SignatureVerifier.kt | 2 +- .../httpsignature/{v2 => verify}/VerifyMaterial.kt | 3 ++- .../v2/DefaultHttpSignatureHeaderParserTest.kt | 1 + .../usbharu/httpsignature/v2/GenerateSignatureTest.kt | 6 ++++++ .../v2/HttpMessageSignatureVerifierTest.kt | 10 ++++++++++ 30 files changed, 56 insertions(+), 27 deletions(-) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/Component.kt (89%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/DerivedComponent.kt (73%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/HttpMessageComponent.kt (89%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/InstantSignatureParameter.kt (86%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/LongSignatureParameter.kt (84%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/Signature.kt (83%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/SignatureBase.kt (96%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/SignatureBaseBuilder.kt (99%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/SignatureParameter.kt (64%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/SignatureParameters.kt (95%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/StringSignatureParameter.kt (85%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => common}/StructuredFieldComponent.kt (89%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/EcdsaP256Sha256SignatureSigner.kt (91%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/HttpMessageSignatureSigner.kt (82%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/Material.kt (61%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/RsaPssSha512SignatureSigner.kt (74%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/RsaPssSignatureSigner.kt (93%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/RsaV1_5Sha256SignatureSigner.kt (92%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => sign}/SignatureSigner.kt (76%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/DefaultHttpSignatureHeaderParser.kt (89%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/HttpMessageSignatureVerifier.kt (87%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/HttpSignatureHeaderParser.kt (59%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/RsaPssSha512SignatureVerifier.kt (73%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/RsaPssSignatureVerifier.kt (92%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/RsaV1_5Sha256SignatureVerifier.kt (90%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/SignatureVerifier.kt (78%) rename src/main/kotlin/dev/usbharu/httpsignature/{v2 => verify}/VerifyMaterial.kt (61%) diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/Component.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/Component.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/Component.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/Component.kt index 3768573..e00fe08 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/Component.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/Component.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common interface Component { val componentName: String diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/DerivedComponent.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/DerivedComponent.kt similarity index 73% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/DerivedComponent.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/DerivedComponent.kt index d3a302c..7af237d 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/DerivedComponent.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/DerivedComponent.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common class DerivedComponent( override val componentName: String, diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageComponent.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/HttpMessageComponent.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageComponent.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/HttpMessageComponent.kt index 16b0b19..f8e7a10 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageComponent.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/HttpMessageComponent.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common class HttpMessageComponent(private val headerName: String, private val headerValues: List) : Component { override val componentName: String diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/InstantSignatureParameter.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/InstantSignatureParameter.kt similarity index 86% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/InstantSignatureParameter.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/InstantSignatureParameter.kt index f21d5f2..11590fa 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/InstantSignatureParameter.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/InstantSignatureParameter.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common import java.time.Instant diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/LongSignatureParameter.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/LongSignatureParameter.kt similarity index 84% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/LongSignatureParameter.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/LongSignatureParameter.kt index 284e3c6..3207962 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/LongSignatureParameter.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/LongSignatureParameter.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common data class LongSignatureParameter(val longName: String, val longValue: Long) : SignatureParameter { override val name: String diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/Signature.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/Signature.kt similarity index 83% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/Signature.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/Signature.kt index 36d8114..7c48d60 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/Signature.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/Signature.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common data class Signature( val label: String, diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBase.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBase.kt similarity index 96% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBase.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBase.kt index e3baf75..dc8ac71 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBase.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBase.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common class SignatureBase() { diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBaseBuilder.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBaseBuilder.kt similarity index 99% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBaseBuilder.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBaseBuilder.kt index 6c2c385..bc04e3f 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureBaseBuilder.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureBaseBuilder.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common import org.greenbytes.http.sfv.Parser import java.net.http.HttpRequest diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameter.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameter.kt similarity index 64% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameter.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameter.kt index bc3c61e..93c6e34 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameter.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameter.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common interface SignatureParameter { val name: String diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameters.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameters.kt similarity index 95% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameters.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameters.kt index 16e68e6..1d840e1 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureParameters.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/SignatureParameters.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common import java.time.Instant diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/StringSignatureParameter.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/StringSignatureParameter.kt similarity index 85% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/StringSignatureParameter.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/StringSignatureParameter.kt index c43d432..a6d0717 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/StringSignatureParameter.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/StringSignatureParameter.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common data class StringSignatureParameter(private val stringName: String, private val stringValue: String) : SignatureParameter { diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/StructuredFieldComponent.kt b/src/main/kotlin/dev/usbharu/httpsignature/common/StructuredFieldComponent.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/StructuredFieldComponent.kt rename to src/main/kotlin/dev/usbharu/httpsignature/common/StructuredFieldComponent.kt index 9efc9a7..014b0bd 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/StructuredFieldComponent.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/common/StructuredFieldComponent.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.common import org.greenbytes.http.sfv.Type diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/EcdsaP256Sha256SignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/EcdsaP256Sha256SignatureSigner.kt similarity index 91% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/EcdsaP256Sha256SignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/EcdsaP256Sha256SignatureSigner.kt index 29217b0..4b9e42e 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/EcdsaP256Sha256SignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/EcdsaP256Sha256SignatureSigner.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign import java.security.PrivateKey import java.security.Signature diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpMessageSignatureSigner.kt similarity index 82% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/HttpMessageSignatureSigner.kt index fa97ad4..112764a 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpMessageSignatureSigner.kt @@ -1,4 +1,7 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign + +import dev.usbharu.httpsignature.common.Signature +import dev.usbharu.httpsignature.common.SignatureParameter class HttpMessageSignatureSigner { fun sign(material: Material, signatureParameters: List, signer: SignatureSigner): Signature { diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/Material.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/Material.kt similarity index 61% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/Material.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/Material.kt index 141b172..51224a5 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/Material.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/Material.kt @@ -1,5 +1,6 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign +import dev.usbharu.httpsignature.common.SignatureBase import java.security.PrivateKey data class Material( diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSha512SignatureSigner.kt similarity index 74% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSha512SignatureSigner.kt index cec24fe..8af46ee 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSha512SignatureSigner.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign import java.security.spec.MGF1ParameterSpec import java.security.spec.PSSParameterSpec diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSignatureSigner.kt similarity index 93% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSignatureSigner.kt index 5acbeb5..edf6c42 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaPssSignatureSigner.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign import java.security.PrivateKey import java.security.Signature diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaV1_5Sha256SignatureSigner.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/RsaV1_5Sha256SignatureSigner.kt index 6ec4715..a6ee5d7 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaV1_5Sha256SignatureSigner.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign import java.security.PrivateKey import java.security.Signature diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/SignatureSigner.kt similarity index 76% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureSigner.kt rename to src/main/kotlin/dev/usbharu/httpsignature/sign/SignatureSigner.kt index a17e0b9..21f4b8b 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/SignatureSigner.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.sign import java.security.PrivateKey diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParser.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultHttpSignatureHeaderParser.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParser.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultHttpSignatureHeaderParser.kt index fea079b..99ad201 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParser.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultHttpSignatureHeaderParser.kt @@ -1,5 +1,9 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify +import dev.usbharu.httpsignature.common.LongSignatureParameter +import dev.usbharu.httpsignature.common.Signature +import dev.usbharu.httpsignature.common.SignatureParameter +import dev.usbharu.httpsignature.common.StringSignatureParameter import org.greenbytes.http.sfv.* import java.util.* diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpMessageSignatureVerifier.kt similarity index 87% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifier.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/HttpMessageSignatureVerifier.kt index be575dc..e901647 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpMessageSignatureVerifier.kt @@ -1,5 +1,6 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify +import dev.usbharu.httpsignature.common.Signature import java.util.* class HttpMessageSignatureVerifier { diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpSignatureHeaderParser.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureHeaderParser.kt similarity index 59% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/HttpSignatureHeaderParser.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureHeaderParser.kt index 16c4bd4..ab5edc0 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/HttpSignatureHeaderParser.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureHeaderParser.kt @@ -1,4 +1,6 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify + +import dev.usbharu.httpsignature.common.Signature interface HttpSignatureHeaderParser { fun parse(signatureInputs: List, signatures: List): Map diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSha512SignatureVerifier.kt similarity index 73% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureVerifier.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSha512SignatureVerifier.kt index a435bc9..7913ccd 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSha512SignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSha512SignatureVerifier.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify import java.security.spec.MGF1ParameterSpec import java.security.spec.PSSParameterSpec diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSignatureVerifier.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureVerifier.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSignatureVerifier.kt index d155771..08051e7 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaPssSignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaPssSignatureVerifier.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify import java.security.PublicKey import java.security.Signature diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaV1_5Sha256SignatureVerifier.kt similarity index 90% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureVerifier.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/RsaV1_5Sha256SignatureVerifier.kt index 4953ada..633bc9b 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/RsaV1_5Sha256SignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaV1_5Sha256SignatureVerifier.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify import java.security.PublicKey import java.security.Signature diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureVerifier.kt similarity index 78% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureVerifier.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureVerifier.kt index 27fbc9b..8bcf055 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/SignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureVerifier.kt @@ -1,4 +1,4 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify import java.security.PublicKey diff --git a/src/main/kotlin/dev/usbharu/httpsignature/v2/VerifyMaterial.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/VerifyMaterial.kt similarity index 61% rename from src/main/kotlin/dev/usbharu/httpsignature/v2/VerifyMaterial.kt rename to src/main/kotlin/dev/usbharu/httpsignature/verify/VerifyMaterial.kt index fb45f9c..510f5d4 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/v2/VerifyMaterial.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/VerifyMaterial.kt @@ -1,5 +1,6 @@ -package dev.usbharu.httpsignature.v2 +package dev.usbharu.httpsignature.verify +import dev.usbharu.httpsignature.common.SignatureBase import java.security.PublicKey data class VerifyMaterial( diff --git a/src/test/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParserTest.kt b/src/test/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParserTest.kt index 80b5de0..dbde403 100644 --- a/src/test/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParserTest.kt +++ b/src/test/kotlin/dev/usbharu/httpsignature/v2/DefaultHttpSignatureHeaderParserTest.kt @@ -1,5 +1,6 @@ package dev.usbharu.httpsignature.v2 +import dev.usbharu.httpsignature.verify.DefaultHttpSignatureHeaderParser import org.junit.jupiter.api.Test class DefaultHttpSignatureHeaderParserTest { diff --git a/src/test/kotlin/dev/usbharu/httpsignature/v2/GenerateSignatureTest.kt b/src/test/kotlin/dev/usbharu/httpsignature/v2/GenerateSignatureTest.kt index ee0f0d7..3ff1af4 100644 --- a/src/test/kotlin/dev/usbharu/httpsignature/v2/GenerateSignatureTest.kt +++ b/src/test/kotlin/dev/usbharu/httpsignature/v2/GenerateSignatureTest.kt @@ -1,5 +1,11 @@ package dev.usbharu.httpsignature.v2 +import dev.usbharu.httpsignature.common.SignatureBaseBuilder +import dev.usbharu.httpsignature.common.SignatureParameters +import dev.usbharu.httpsignature.sign.HttpMessageSignatureSigner +import dev.usbharu.httpsignature.sign.Material +import dev.usbharu.httpsignature.sign.RsaPssSha512SignatureSigner +import dev.usbharu.httpsignature.sign.RsaV1_5Sha256SignatureSigner import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifierTest.kt b/src/test/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifierTest.kt index 84b5ebe..7c305e8 100644 --- a/src/test/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifierTest.kt +++ b/src/test/kotlin/dev/usbharu/httpsignature/v2/HttpMessageSignatureVerifierTest.kt @@ -1,5 +1,15 @@ package dev.usbharu.httpsignature.v2 +import dev.usbharu.httpsignature.common.SignatureBaseBuilder +import dev.usbharu.httpsignature.common.SignatureParameters +import dev.usbharu.httpsignature.sign.HttpMessageSignatureSigner +import dev.usbharu.httpsignature.sign.Material +import dev.usbharu.httpsignature.sign.RsaPssSha512SignatureSigner +import dev.usbharu.httpsignature.sign.RsaV1_5Sha256SignatureSigner +import dev.usbharu.httpsignature.verify.HttpMessageSignatureVerifier +import dev.usbharu.httpsignature.verify.RsaPssSha512SignatureVerifier +import dev.usbharu.httpsignature.verify.RsaV1_5Sha256SignatureVerifier +import dev.usbharu.httpsignature.verify.VerifyMaterial import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import java.security.KeyFactory