From 8e957371a3d19fc5945eb1660fe6b7cf18104395 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 5 Oct 2020 13:36:55 -0400 Subject: [PATCH] gitsrht-update-hook: update core-go --- gitsrht-update-hook/go.mod | 2 +- gitsrht-update-hook/go.sum | 4 ++++ gitsrht-update-hook/main.go | 3 +++ gitsrht-update-hook/webhooks.go | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gitsrht-update-hook/go.mod b/gitsrht-update-hook/go.mod index 2f9a918..6d29243 100644 --- a/gitsrht-update-hook/go.mod +++ b/gitsrht-update-hook/go.mod @@ -3,7 +3,7 @@ module git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook go 1.13 require ( - git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e + git.sr.ht/~sircmpwn/core-go v0.0.0-20201005173246-a9e49d17a1e6 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 github.com/fernet/fernet-go v0.0.0-20191111064656-eff2850e6001 github.com/go-git/go-git/v5 v5.1.0 diff --git a/gitsrht-update-hook/go.sum b/gitsrht-update-hook/go.sum index ce79230..cc41162 100644 --- a/gitsrht-update-hook/go.sum +++ b/gitsrht-update-hook/go.sum @@ -1,5 +1,7 @@ git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e h1:TJqf/neVU5peFAS9WcR1aADXcflPOvAd7ABEirmU7m0= git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e/go.mod h1:aXSNgRsGoI3tTFKlwD0xm2htbEzKlR2xUm1osRxfhOM= +git.sr.ht/~sircmpwn/core-go v0.0.0-20201005173246-a9e49d17a1e6 h1:Ky6HzcRmbMUxOrWXv04+mb97GkyxO/Nx7v8uJBUdpNk= +git.sr.ht/~sircmpwn/core-go v0.0.0-20201005173246-a9e49d17a1e6/go.mod h1:HpPX22ilJUWKOA4NDhrOcIyblQhdiKHPg4oMJFYdh0Y= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -81,6 +83,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec h1:DGmKwyZwEB8dI7tbLt/I/gQuP559o/0FrAkHKlQM/Ks= github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod h1:owBmyHYMLkxyrugmfwE/DLJyW8Ro9mkphwuVErQ0iUw= github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= @@ -126,3 +129,4 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/gitsrht-update-hook/main.go b/gitsrht-update-hook/main.go index 635d539..a281ec1 100644 --- a/gitsrht-update-hook/main.go +++ b/gitsrht-update-hook/main.go @@ -5,6 +5,7 @@ import ( "os" "github.com/vaughan0/go-ini" + "git.sr.ht/~sircmpwn/core-go/crypto" ) var ( @@ -67,4 +68,6 @@ func init() { } buildOrigin, _ = config.Get("builds.sr.ht", "origin") // Optional + + crypto.InitCrypto(config) } diff --git a/gitsrht-update-hook/webhooks.go b/gitsrht-update-hook/webhooks.go index 5a9a435..beb3259 100644 --- a/gitsrht-update-hook/webhooks.go +++ b/gitsrht-update-hook/webhooks.go @@ -60,7 +60,7 @@ func deliverWebhooks(subs []WebhookSubscription, client := &http.Client{Timeout: 5 * time.Second} for _, sub := range subs { - nonce, signature := crypto.SignWebhookPayload(payload, logger, config) + nonce, signature := crypto.SignWebhook(payload) deliveryUuid := uuid.New().String() body := bytes.NewBuffer(payload) -- 2.38.4