From 13c5d73b8e6ca8449dd0b9142f79346d39c11db2 Mon Sep 17 00:00:00 2001 From: Naoki Kosaka Date: Sun, 10 May 2020 14:42:11 +0900 Subject: [PATCH] Revert "Update Dependency." This reverts commit 81581db527a4bcc54350e061def7699e1309873f. --- decode.go | 2 +- go.mod | 3 +-- worker/sender.go | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/decode.go b/decode.go index 9fdc702..f9e3414 100644 --- a/decode.go +++ b/decode.go @@ -9,10 +9,10 @@ import ( "net/http" "strconv" - "github.com/go-fed/httpsig" "github.com/spf13/viper" activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" + "github.com/yukimochi/httpsig" ) func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.Actor, []byte, error) { diff --git a/go.mod b/go.mod index 3d88276..22d36f7 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,10 @@ module github.com/yukimochi/Activity-Relay -go 1.14 +go 1.13 require ( github.com/RichardKnop/machinery v1.7.8 github.com/Songmu/go-httpdate v1.0.0 - github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe github.com/go-redis/redis v6.15.7+incompatible github.com/patrickmn/go-cache v2.1.0+incompatible github.com/satori/go.uuid v1.2.0 diff --git a/worker/sender.go b/worker/sender.go index 4e4befc..8028902 100644 --- a/worker/sender.go +++ b/worker/sender.go @@ -11,8 +11,8 @@ import ( "time" httpdate "github.com/Songmu/go-httpdate" - "github.com/go-fed/httpsig" "github.com/spf13/viper" + "github.com/yukimochi/httpsig" ) func appendSignature(request *http.Request, body *[]byte, KeyID string, publicKey *rsa.PrivateKey) error { @@ -22,11 +22,11 @@ func appendSignature(request *http.Request, body *[]byte, KeyID string, publicKe request.Header.Set("Digest", "SHA-256="+base64.StdEncoding.EncodeToString(b)) request.Header.Set("Host", request.Host) - signer, _, err := httpsig.NewSigner([]httpsig.Algorithm{httpsig.RSA_SHA256}, httpsig.DigestSha256, []string{httpsig.RequestTarget, "Host", "Date", "Digest", "Content-Type"}, httpsig.Signature) + signer, _, err := httpsig.NewSigner([]httpsig.Algorithm{httpsig.RSA_SHA256}, []string{httpsig.RequestTarget, "Host", "Date", "Digest", "Content-Type"}, httpsig.Signature) if err != nil { return err } - err = signer.SignRequest(publicKey, KeyID, request, *body) + err = signer.SignRequest(publicKey, KeyID, request) if err != nil { return err }