Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

Use go-ap instead of go-fed

Browse source
This commit is contained in:
Anthony Wang 2022-05-23 11:43:59 -05:00
parent 501a39fb98
commit becdf5e1f1
No known key found for this signature in database
GPG key ID: BC96B00AEC5F2D76
8 changed files with 38 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/activitypub/client.go
View file

@ -17,7 +17,6 @@ import (
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
"github.com/go-fed/activity/pub"
"github.com/go-fed/httpsig"
)
@ -46,7 +45,6 @@ func containsRequiredHTTPHeaders(method string, headers []string) error {
// Client struct
type Client struct {
clock pub.Clock
client *http.Client
algs []httpsig.Algorithm
digestAlg httpsig.DigestAlgorithm
@ -67,10 +65,6 @@ func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
for i, algo := range setting.Federation.Algorithms {
algos[i] = httpsig.Algorithm(algo)
}
clock, err := NewClock()
if err != nil {
return
}
priv, err := GetPrivateKey(user)
if err != nil {
@ -83,7 +77,6 @@ func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
}
c = &Client{
clock: clock,
client: &http.Client{
Transport: &http.Transport{
Proxy: proxy.Proxy(),
@ -108,7 +101,7 @@ func (c *Client) NewRequest(b []byte, to string) (req *http.Request, err error)
}
req.Header.Add("Content-Type", ActivityStreamsContentType)
req.Header.Add("Accept-Charset", "utf-8")
req.Header.Add("Date", fmt.Sprintf("%s GMT", c.clock.Now().UTC().Format(time.RFC1123)))
req.Header.Add("Date", fmt.Sprintf("%s GMT", time.Now().UTC().Format(time.RFC1123)))
signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, httpsigExpirationTime)
if err != nil {

27
modules/activitypub/clock.go
View file

@ -1,27 +0,0 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package activitypub
import (
"time"
"github.com/go-fed/activity/pub"
)
var _ pub.Clock = &Clock{}
// Clock struct
type Clock struct{}
// NewClock function
func NewClock() (c *Clock, err error) {
c = &Clock{}
return
}
// Now function
func (c *Clock) Now() time.Time {
return time.Now().Local()
}

30
modules/activitypub/clock_test.go
View file

@ -1,30 +0,0 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package activitypub
import (
"regexp"
"testing"
"time"
"code.gitea.io/gitea/modules/setting"
"github.com/stretchr/testify/assert"
)
func TestClock(t *testing.T) {
DefaultUILocation := setting.DefaultUILocation
defer func() {
setting.DefaultUILocation = DefaultUILocation
}()
c, err := NewClock()
assert.NoError(t, err)
setting.DefaultUILocation, err = time.LoadLocation("UTC")
assert.NoError(t, err)
assert.Regexp(t, regexp.MustCompile(`\+0000$`), c.Now().Format(time.Layout))
setting.DefaultUILocation, err = time.LoadLocation("Europe/Paris")
assert.NoError(t, err)
assert.Regexp(t, regexp.MustCompile(`\+0[21]00$`), c.Now().Format(time.Layout))
}