refactor: 旧APIを非推奨に
This commit is contained in:
parent
c15cb74b73
commit
8545a4b591
|
@ -4,6 +4,7 @@ import dev.usbharu.httpsignature.common.HttpHeaders
|
||||||
import dev.usbharu.httpsignature.common.HttpMethod
|
import dev.usbharu.httpsignature.common.HttpMethod
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
abstract class AbstractHttpSignatureSigner : HttpSignatureSigner {
|
abstract class AbstractHttpSignatureSigner : HttpSignatureSigner {
|
||||||
override fun buildSignString(
|
override fun buildSignString(
|
||||||
url: URL,
|
url: URL,
|
||||||
|
|
|
@ -9,6 +9,7 @@ import java.security.spec.PSSParameterSpec
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class Hs2019HttpSignatureSigner(private val expires: Long,private val salt:Int = 64) :
|
class Hs2019HttpSignatureSigner(private val expires: Long,private val salt:Int = 64) :
|
||||||
AbstractHttpSignatureSigner() {
|
AbstractHttpSignatureSigner() {
|
||||||
override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature {
|
override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature {
|
||||||
|
|
|
@ -6,6 +6,7 @@ import dev.usbharu.httpsignature.common.HttpRequest
|
||||||
import dev.usbharu.httpsignature.common.PrivateKey
|
import dev.usbharu.httpsignature.common.PrivateKey
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
interface HttpSignatureSigner {
|
interface HttpSignatureSigner {
|
||||||
fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature
|
fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature
|
||||||
fun signRaw(signString: String, privateKey: PrivateKey, signHeaders: List<String>): String
|
fun signRaw(signString: String, privateKey: PrivateKey, signHeaders: List<String>): String
|
||||||
|
|
|
@ -4,6 +4,7 @@ import dev.usbharu.httpsignature.common.HttpRequest
|
||||||
import dev.usbharu.httpsignature.common.PrivateKey
|
import dev.usbharu.httpsignature.common.PrivateKey
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class RsaSha256HttpSignatureSigner : AbstractHttpSignatureSigner() {
|
class RsaSha256HttpSignatureSigner : AbstractHttpSignatureSigner() {
|
||||||
override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature {
|
override fun sign(httpRequest: HttpRequest, privateKey: PrivateKey, signHeaders: List<String>): Signature {
|
||||||
val buildSignString = buildSignString(httpRequest.url, httpRequest.method, httpRequest.headers, signHeaders)
|
val buildSignString = buildSignString(httpRequest.url, httpRequest.method, httpRequest.headers, signHeaders)
|
||||||
|
|
|
@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.sign
|
||||||
|
|
||||||
import dev.usbharu.httpsignature.common.HttpRequest
|
import dev.usbharu.httpsignature.common.HttpRequest
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
data class Signature(
|
data class Signature(
|
||||||
val request: HttpRequest,
|
val request: HttpRequest,
|
||||||
val signature: String,
|
val signature: String,
|
||||||
|
|
|
@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.verify
|
||||||
|
|
||||||
import dev.usbharu.httpsignature.common.HttpHeaders
|
import dev.usbharu.httpsignature.common.HttpHeaders
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class DefaultSignatureHeaderParser : SignatureHeaderParser {
|
class DefaultSignatureHeaderParser : SignatureHeaderParser {
|
||||||
override fun parse(httpHeaders: HttpHeaders): Signature {
|
override fun parse(httpHeaders: HttpHeaders): Signature {
|
||||||
val signatureHeader = httpHeaders.get("Signature").single()
|
val signatureHeader = httpHeaders.get("Signature").single()
|
||||||
|
|
|
@ -10,6 +10,7 @@ import java.security.spec.PSSParameterSpec
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class Hs2019HttpSignatureVerifier(
|
class Hs2019HttpSignatureVerifier(
|
||||||
private val signatureHeaderParser: SignatureHeaderParser,
|
private val signatureHeaderParser: SignatureHeaderParser,
|
||||||
private val salt: Int = 64
|
private val salt: Int = 64
|
||||||
|
|
|
@ -3,6 +3,7 @@ package dev.usbharu.httpsignature.verify
|
||||||
import dev.usbharu.httpsignature.common.HttpRequest
|
import dev.usbharu.httpsignature.common.HttpRequest
|
||||||
import dev.usbharu.httpsignature.common.PublicKey
|
import dev.usbharu.httpsignature.common.PublicKey
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
interface HttpSignatureVerifier {
|
interface HttpSignatureVerifier {
|
||||||
fun verify(httpRequest: HttpRequest,key: PublicKey):VerificationResult
|
fun verify(httpRequest: HttpRequest,key: PublicKey):VerificationResult
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import dev.usbharu.httpsignature.sign.HttpSignatureSigner
|
||||||
import java.security.Signature
|
import java.security.Signature
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class RsaSha256HttpSignatureVerifier(
|
class RsaSha256HttpSignatureVerifier(
|
||||||
private val signatureHeaderParser: SignatureHeaderParser,
|
private val signatureHeaderParser: SignatureHeaderParser,
|
||||||
private val httpSignatureSigner: HttpSignatureSigner
|
private val httpSignatureSigner: HttpSignatureSigner
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package dev.usbharu.httpsignature.verify
|
package dev.usbharu.httpsignature.verify
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
data class Signature(
|
data class Signature(
|
||||||
val keyId: String,
|
val keyId: String,
|
||||||
val algorithm: String,
|
val algorithm: String,
|
||||||
|
|
|
@ -2,6 +2,7 @@ package dev.usbharu.httpsignature.verify
|
||||||
|
|
||||||
import dev.usbharu.httpsignature.common.HttpHeaders
|
import dev.usbharu.httpsignature.common.HttpHeaders
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
interface SignatureHeaderParser {
|
interface SignatureHeaderParser {
|
||||||
fun parse(httpHeaders: HttpHeaders):Signature
|
fun parse(httpHeaders: HttpHeaders):Signature
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
package dev.usbharu.httpsignature.verify
|
package dev.usbharu.httpsignature.verify
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
sealed class VerificationResult(val success: Boolean)
|
sealed class VerificationResult(val success: Boolean)
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
class SuccessfulVerification : VerificationResult(true)
|
class SuccessfulVerification : VerificationResult(true)
|
||||||
|
|
||||||
|
@Deprecated("")
|
||||||
open class FailedVerification(val reason: String) : VerificationResult(false)
|
open class FailedVerification(val reason: String) : VerificationResult(false)
|
||||||
|
|
Loading…
Reference in New Issue