From 8545a4b5915a5a3b8acb161bbcc81bc104cd35ce Mon Sep 17 00:00:00 2001 From: usbharu Date: Tue, 24 Sep 2024 11:39:34 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=97=A7API=E3=82=92=E9=9D=9E?= =?UTF-8?q?=E6=8E=A8=E5=A5=A8=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../httpsignature/sign/AbstractHttpSignatureSigner.kt | 1 + .../usbharu/httpsignature/sign/Hs2019HttpSignatureSigner.kt | 1 + .../dev/usbharu/httpsignature/sign/HttpSignatureSigner.kt | 1 + .../httpsignature/sign/RsaSha256HttpSignatureSigner.kt | 1 + src/main/kotlin/dev/usbharu/httpsignature/sign/Signature.kt | 1 + .../httpsignature/verify/DefaultSignatureHeaderParser.kt | 1 + .../httpsignature/verify/Hs2019HttpSignatureVerifier.kt | 1 + .../usbharu/httpsignature/verify/HttpSignatureVerifier.kt | 1 + .../httpsignature/verify/RsaSha256HttpSignatureVerifier.kt | 1 + .../kotlin/dev/usbharu/httpsignature/verify/Signature.kt | 1 + .../usbharu/httpsignature/verify/SignatureHeaderParser.kt | 1 + .../dev/usbharu/httpsignature/verify/VerificationResult.kt | 5 ++++- 12 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/usbharu/httpsignature/sign/AbstractHttpSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/AbstractHttpSignatureSigner.kt index 71d1fe2..a7008b7 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/sign/AbstractHttpSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/AbstractHttpSignatureSigner.kt @@ -4,6 +4,7 @@ import dev.usbharu.httpsignature.common.HttpHeaders import dev.usbharu.httpsignature.common.HttpMethod import java.net.URL +@Deprecated("") abstract class AbstractHttpSignatureSigner : HttpSignatureSigner { override fun buildSignString( url: URL, diff --git a/src/main/kotlin/dev/usbharu/httpsignature/sign/Hs2019HttpSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/Hs2019HttpSignatureSigner.kt index 7d5f3b1..b80fa09 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/sign/Hs2019HttpSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/Hs2019HttpSignatureSigner.kt @@ -9,6 +9,7 @@ import java.security.spec.PSSParameterSpec import java.time.Instant import java.util.* +@Deprecated("") class Hs2019HttpSignatureSigner(private val expires: Long,private val salt:Int = 64) : AbstractHttpSignatureSigner() { override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List): Signature { diff --git a/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpSignatureSigner.kt index 88e57e2..f1cf76a 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/HttpSignatureSigner.kt @@ -6,6 +6,7 @@ import dev.usbharu.httpsignature.common.HttpRequest import dev.usbharu.httpsignature.common.PrivateKey import java.net.URL +@Deprecated("") interface HttpSignatureSigner { fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List): Signature fun signRaw(signString: String, privateKey: PrivateKey, signHeaders: List): String diff --git a/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaSha256HttpSignatureSigner.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaSha256HttpSignatureSigner.kt index 8f0ce01..e2ec266 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaSha256HttpSignatureSigner.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/RsaSha256HttpSignatureSigner.kt @@ -4,6 +4,7 @@ import dev.usbharu.httpsignature.common.HttpRequest import dev.usbharu.httpsignature.common.PrivateKey import java.util.* +@Deprecated("") class RsaSha256HttpSignatureSigner : AbstractHttpSignatureSigner() { override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List): Signature { val buildSignString = buildSignString(httpRequest.url, httpRequest.method, httpRequest.headers, signHeaders) diff --git a/src/main/kotlin/dev/usbharu/httpsignature/sign/Signature.kt b/src/main/kotlin/dev/usbharu/httpsignature/sign/Signature.kt index 4af9444..da7c68d 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/sign/Signature.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/sign/Signature.kt @@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.sign import dev.usbharu.httpsignature.common.HttpRequest +@Deprecated("") data class Signature( val request: HttpRequest, val signature: String, diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultSignatureHeaderParser.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultSignatureHeaderParser.kt index 4d2dd3f..82cd2fe 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultSignatureHeaderParser.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/DefaultSignatureHeaderParser.kt @@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.verify import dev.usbharu.httpsignature.common.HttpHeaders +@Deprecated("") class DefaultSignatureHeaderParser : SignatureHeaderParser { override fun parse(httpHeaders: HttpHeaders): Signature { val signatureHeader = httpHeaders.get("Signature").single() diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/Hs2019HttpSignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/Hs2019HttpSignatureVerifier.kt index c6f075e..6019cf8 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/Hs2019HttpSignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/Hs2019HttpSignatureVerifier.kt @@ -10,6 +10,7 @@ import java.security.spec.PSSParameterSpec import java.time.Instant import java.util.* +@Deprecated("") class Hs2019HttpSignatureVerifier( private val signatureHeaderParser: SignatureHeaderParser, private val salt: Int = 64 diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureVerifier.kt index d6dd0d9..d2f8e36 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/HttpSignatureVerifier.kt @@ -3,6 +3,7 @@ package dev.usbharu.httpsignature.verify import dev.usbharu.httpsignature.common.HttpRequest import dev.usbharu.httpsignature.common.PublicKey +@Deprecated("") interface HttpSignatureVerifier { fun verify(httpRequest: HttpRequest,key: PublicKey):VerificationResult } diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaSha256HttpSignatureVerifier.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaSha256HttpSignatureVerifier.kt index 8d4d3d0..ff838fa 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaSha256HttpSignatureVerifier.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/RsaSha256HttpSignatureVerifier.kt @@ -6,6 +6,7 @@ import dev.usbharu.httpsignature.sign.HttpSignatureSigner import java.security.Signature import java.util.* +@Deprecated("") class RsaSha256HttpSignatureVerifier( private val signatureHeaderParser: SignatureHeaderParser, private val httpSignatureSigner: HttpSignatureSigner diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/Signature.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/Signature.kt index 6199356..f765682 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/Signature.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/Signature.kt @@ -1,5 +1,6 @@ package dev.usbharu.httpsignature.verify +@Deprecated("") data class Signature( val keyId: String, val algorithm: String, diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureHeaderParser.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureHeaderParser.kt index 6e8f45c..9859fe4 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureHeaderParser.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/SignatureHeaderParser.kt @@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.verify import dev.usbharu.httpsignature.common.HttpHeaders +@Deprecated("") interface SignatureHeaderParser { fun parse(httpHeaders: HttpHeaders):Signature } diff --git a/src/main/kotlin/dev/usbharu/httpsignature/verify/VerificationResult.kt b/src/main/kotlin/dev/usbharu/httpsignature/verify/VerificationResult.kt index 721b854..001639f 100644 --- a/src/main/kotlin/dev/usbharu/httpsignature/verify/VerificationResult.kt +++ b/src/main/kotlin/dev/usbharu/httpsignature/verify/VerificationResult.kt @@ -1,7 +1,10 @@ package dev.usbharu.httpsignature.verify +@Deprecated("") sealed class VerificationResult(val success: Boolean) +@Deprecated("") class SuccessfulVerification : VerificationResult(true) -open class FailedVerification(val reason:String) : VerificationResult(false) +@Deprecated("") +open class FailedVerification(val reason: String) : VerificationResult(false)