From f4dd9a301f2f74bf9ee3a6847303a034cc6c1b8b Mon Sep 17 00:00:00 2001 From: tobi Date: Thu, 24 Apr 2025 22:50:16 +0200 Subject: [PATCH] move httpsig --- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/federation/authenticate.go | 2 +- internal/federation/federatingprotocol_test.go | 2 +- internal/gtscontext/context.go | 2 +- internal/middleware/signaturecheck.go | 2 +- internal/transport/signing.go | 2 +- internal/transport/transport.go | 2 +- .../httpsig/LICENSE | 0 .../httpsig/README.md | 4 ++-- .../httpsig/algorithms.go | 0 .../httpsig/digest.go | 0 .../httpsig/httpsig.go | 0 .../httpsig/signing.go | 0 .../httpsig/verifying.go | 0 vendor/modules.txt | 6 +++--- 17 files changed, 15 insertions(+), 15 deletions(-) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/LICENSE (100%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/README.md (96%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/algorithms.go (100%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/digest.go (100%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/httpsig.go (100%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/signing.go (100%) rename vendor/{codeberg.org/superseriousbusiness => code.superseriousbusiness.org}/httpsig/verifying.go (100%) diff --git a/README.md b/README.md index 23209336d..2d457c164 100644 --- a/README.md +++ b/README.md @@ -435,7 +435,7 @@ The following open source libraries, frameworks, and tools are used by GoToSocia - superseriousbusiness: - [superseriousbusiness/activity](https://codeberg.org/superseriousbusiness/activity) forked from [go-fed/activity](https://github.com/go-fed/activity); Golang ActivityPub/ActivityStreams library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). - [superseriousbusiness/exif-terminator](https://codeberg.org/superseriousbusiness/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html). - - [superseriousbusiness/httpsig](https://codeberg.org/superseriousbusiness/httpsig) forked from [go-fed/httpsig](https://github.com/go-fed/httpsig); secure HTTP signature library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). + - [superseriousbusiness/httpsig](https://code.superseriousbusiness.org/httpsig) forked from [go-fed/httpsig](https://github.com/go-fed/httpsig); secure HTTP signature library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). - [superseriousbusiness/oauth2](https://codeberg.org/superseriousbusiness/oauth2) forked from [go-oauth2/oauth2](https://github.com/go-oauth2/oauth2); OAuth server framework and token handling. [MIT License](https://spdx.org/licenses/MIT.html). - [temoto/robotstxt](https://github.com/temoto/robotstxt); robots.txt parsing. [MIT License](https://spdx.org/licenses/MIT.html). - [tdewolff/minify](https://github.com/tdewolff/minify); HTML minification for Markdown-submitted posts. [MIT License](https://spdx.org/licenses/MIT.html). diff --git a/go.mod b/go.mod index 6313491d1..460be3406 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ replace github.com/go-swagger/go-swagger => codeberg.org/superseriousbusiness/go replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.0-concurrency-workaround require ( + code.superseriousbusiness.org/httpsig v1.4.0 codeberg.org/gruf/go-bytes v1.0.2 codeberg.org/gruf/go-bytesize v1.0.3 codeberg.org/gruf/go-byteutil v1.3.0 @@ -30,7 +31,6 @@ require ( codeberg.org/gruf/go-structr v0.9.6 codeberg.org/superseriousbusiness/activity v1.14.0 codeberg.org/superseriousbusiness/exif-terminator v0.10.0 - codeberg.org/superseriousbusiness/httpsig v1.3.0-SSB codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB github.com/DmitriyVTitov/size v1.5.0 github.com/KimMachineGun/automemlimit v0.7.1 diff --git a/go.sum b/go.sum index fb37eb1d3..8b311d7ae 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +code.superseriousbusiness.org/httpsig v1.4.0 h1:g9+KQMoTG0oR0II5gYb5pVVdNjbc7CiiuqK8vcZjeQg= +code.superseriousbusiness.org/httpsig v1.4.0/go.mod h1:i2AKpj/WbA/o/UTvia9TAREzt0jP1AH3T1Uxjyhdzlw= codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo= codeberg.org/gruf/go-bytes v1.0.2/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg= codeberg.org/gruf/go-bytesize v1.0.3 h1:Tz8tCxhPLeyM5VryuBNjUHgKmLj4Bx9RbPaUSA3qg6g= @@ -50,8 +52,6 @@ codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB h1:Lqi70g codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB/go.mod h1:99rP8gsZoCSUj+/lLdpV9+i86ujLdKSoUjvuxbgvN4M= codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix h1:+JvBZqsQfdT+ROnk2DkvXsKQ9QBorKKKBk5fBqw62I8= codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po= -codeberg.org/superseriousbusiness/httpsig v1.3.0-SSB h1:0a2fQSgMZA3/k+zjb2Ot+kwzpWFHOVEGQR2t49NhglA= -codeberg.org/superseriousbusiness/httpsig v1.3.0-SSB/go.mod h1:mkfkHGdE2SCbNBHySjJZSDr3LHtwZb1Yjgc6GYPwAQM= codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB h1:UAFZKgUaeQEoHDmawh9DWXFopJnADfkiDo/CLAtWISc= codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB/go.mod h1:fAEs7S0vD9yB+h7zBUWfAqwdbVqF4n8FcTnXpJC//AM= github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g= diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go index 363568f8b..c080ac00d 100644 --- a/internal/federation/authenticate.go +++ b/internal/federation/authenticate.go @@ -28,10 +28,10 @@ import ( "net/url" "time" + "code.superseriousbusiness.org/httpsig" "codeberg.org/gruf/go-kv" "codeberg.org/superseriousbusiness/activity/streams" typepublickey "codeberg.org/superseriousbusiness/activity/streams/impl/w3idsecurityv1/type_publickey" - "codeberg.org/superseriousbusiness/httpsig" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" diff --git a/internal/federation/federatingprotocol_test.go b/internal/federation/federatingprotocol_test.go index 7307ec6cc..08c7fcd8f 100644 --- a/internal/federation/federatingprotocol_test.go +++ b/internal/federation/federatingprotocol_test.go @@ -27,8 +27,8 @@ import ( "net/url" "testing" + "code.superseriousbusiness.org/httpsig" errorsv2 "codeberg.org/gruf/go-errors/v2" - "codeberg.org/superseriousbusiness/httpsig" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/gtscontext" diff --git a/internal/gtscontext/context.go b/internal/gtscontext/context.go index b0dd4788c..985361a98 100644 --- a/internal/gtscontext/context.go +++ b/internal/gtscontext/context.go @@ -22,7 +22,7 @@ import ( "net/http" "net/url" - "codeberg.org/superseriousbusiness/httpsig" + "code.superseriousbusiness.org/httpsig" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) diff --git a/internal/middleware/signaturecheck.go b/internal/middleware/signaturecheck.go index 3e1bfef33..fd89cd886 100644 --- a/internal/middleware/signaturecheck.go +++ b/internal/middleware/signaturecheck.go @@ -25,7 +25,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/log" - "codeberg.org/superseriousbusiness/httpsig" + "code.superseriousbusiness.org/httpsig" "github.com/gin-gonic/gin" ) diff --git a/internal/transport/signing.go b/internal/transport/signing.go index 6fe29a853..050ed609d 100644 --- a/internal/transport/signing.go +++ b/internal/transport/signing.go @@ -18,7 +18,7 @@ package transport import ( - "codeberg.org/superseriousbusiness/httpsig" + "code.superseriousbusiness.org/httpsig" ) var ( diff --git a/internal/transport/transport.go b/internal/transport/transport.go index 7d605f035..2ef070541 100644 --- a/internal/transport/transport.go +++ b/internal/transport/transport.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "codeberg.org/superseriousbusiness/httpsig" + "code.superseriousbusiness.org/httpsig" "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/httpclient" diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/LICENSE b/vendor/code.superseriousbusiness.org/httpsig/LICENSE similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/LICENSE rename to vendor/code.superseriousbusiness.org/httpsig/LICENSE diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/README.md b/vendor/code.superseriousbusiness.org/httpsig/README.md similarity index 96% rename from vendor/codeberg.org/superseriousbusiness/httpsig/README.md rename to vendor/code.superseriousbusiness.org/httpsig/README.md index 2108ed06c..094133b20 100644 --- a/vendor/codeberg.org/superseriousbusiness/httpsig/README.md +++ b/vendor/code.superseriousbusiness.org/httpsig/README.md @@ -4,7 +4,7 @@ > HTTP Signatures made simple -`go get codeberg.org/superseriousbusiness/httpsig` +`go get code.superseriousbusiness.org/httpsig` Implementation of [HTTP Signatures](https://tools.ietf.org/html/draft-cavage-http-signatures). @@ -21,7 +21,7 @@ signing of hash schemes. Its goals are: ## How to use -`import "codeberg.org/superseriousbusiness/httpsig"` +`import "code.superseriousbusiness.org/httpsig"` ### Signing diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/algorithms.go b/vendor/code.superseriousbusiness.org/httpsig/algorithms.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/algorithms.go rename to vendor/code.superseriousbusiness.org/httpsig/algorithms.go diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/digest.go b/vendor/code.superseriousbusiness.org/httpsig/digest.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/digest.go rename to vendor/code.superseriousbusiness.org/httpsig/digest.go diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/httpsig.go b/vendor/code.superseriousbusiness.org/httpsig/httpsig.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/httpsig.go rename to vendor/code.superseriousbusiness.org/httpsig/httpsig.go diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/signing.go b/vendor/code.superseriousbusiness.org/httpsig/signing.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/signing.go rename to vendor/code.superseriousbusiness.org/httpsig/signing.go diff --git a/vendor/codeberg.org/superseriousbusiness/httpsig/verifying.go b/vendor/code.superseriousbusiness.org/httpsig/verifying.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/httpsig/verifying.go rename to vendor/code.superseriousbusiness.org/httpsig/verifying.go diff --git a/vendor/modules.txt b/vendor/modules.txt index ae358fc29..1e5c31e8d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,6 @@ +# code.superseriousbusiness.org/httpsig v1.4.0 +## explicit; go 1.21 +code.superseriousbusiness.org/httpsig # codeberg.org/gruf/go-bytes v1.0.2 ## explicit; go 1.14 codeberg.org/gruf/go-bytes @@ -272,9 +275,6 @@ codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 # codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB ## explicit; go 1.12 codeberg.org/superseriousbusiness/go-png-image-structure/v2 -# codeberg.org/superseriousbusiness/httpsig v1.3.0-SSB -## explicit; go 1.21 -codeberg.org/superseriousbusiness/httpsig # codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB ## explicit; go 1.23.0 codeberg.org/superseriousbusiness/oauth2/v4