feat: update dependencies and prepare using context

yukimochi · Feb 4, 2024 · dbfdb4a · dbfdb4a
1 parent 7f942e7
commit dbfdb4a
Show file tree

Hide file tree

Showing 25 changed files with 235 additions and 759 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.2-alpine AS build
+FROM golang:1.21.6-alpine AS build
 
 WORKDIR /Activity-Relay
 COPY . /Activity-Relay
@@ -7,7 +7,7 @@ RUN  mkdir -p /rootfs/usr/bin && \
      apk add -U --no-cache git && \
      go build -o /rootfs/usr/bin/relay -ldflags "-X main.version=$(git describe --tags HEAD | sed -r 's/v(.*)/\1/')" .
 
-FROM alpine:3.18.4
+FROM alpine:3.19.1
 
 COPY --from=build /rootfs/usr/bin /usr/bin
 RUN  chmod +x /usr/bin/relay && \

diff --git a/api/api_test.go b/api/api_test.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -33,7 +34,7 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 	RelayState = models.NewState(RelayState.RedisClient, false)
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 	code := m.Run()
 	os.Exit(code)
 }
diff --git a/api/decode_test.go b/api/decode_test.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"net/http"
 	"os"
@@ -12,7 +13,7 @@ import (
 )
 
 func TestDecodeActivity(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	RelayState.AddSubscriber(models.Subscriber{
 		Domain:   "innocent.yukimochi.io",
@@ -41,7 +42,7 @@ func TestDecodeActivity(t *testing.T) {
 }
 
 func TestDecodeActivityWithNoSignature(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	RelayState.AddSubscriber(models.Subscriber{
 		Domain:   "innocent.yukimochi.io",
@@ -65,7 +66,7 @@ func TestDecodeActivityWithNoSignature(t *testing.T) {
 }
 
 func TestDecodeActivityWithNotFoundKeyId(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	RelayState.AddSubscriber(models.Subscriber{
 		Domain:   "innocent.yukimochi.io",
@@ -90,7 +91,7 @@ func TestDecodeActivityWithNotFoundKeyId(t *testing.T) {
 }
 
 func TestDecodeActivityWithInvalidDigest(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	RelayState.AddSubscriber(models.Subscriber{
 		Domain:   "innocent.yukimochi.io",

diff --git a/api/handle.go b/api/handle.go
@@ -3,10 +3,11 @@ package api
 import (
 	"encoding/json"
 	"errors"
-	"github.com/sirupsen/logrus"
-	"github.com/yukimochi/Activity-Relay/models"
 	"net/http"
 	"net/url"
+
+	"github.com/sirupsen/logrus"
+	"github.com/yukimochi/Activity-Relay/models"
 )
 
 func handleWebfinger(writer http.ResponseWriter, request *http.Request) {

diff --git a/api/handle_test.go b/api/handle_test.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"io"
 	"log"
@@ -417,7 +418,7 @@ func TestHandleInboxValidFollow(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 1 {
 		t.Fatalf("fail - follow request not work")
 	}
@@ -445,11 +446,11 @@ func TestHandleInboxValidManuallyFollow(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:pending:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:pending:"+domain.Host).Result()
 	if res != 1 {
 		t.Fatalf("fail - manually follow not work")
 	}
-	res, _ = RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ = RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - manually follow not work")
 	}
@@ -477,7 +478,7 @@ func TestHandleInboxValidFollowBlocked(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - follow request not blocked")
 	}
@@ -503,7 +504,7 @@ func TestHandleInboxFollowLitePub(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - follow request not blocked")
 	}
@@ -527,7 +528,7 @@ func TestHandleInboxInvalidFollow(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - follow request not blocked")
 	}
@@ -556,7 +557,7 @@ func TestHandleInboxValidUnfollow(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - unfollow request not works")
 	}
@@ -572,7 +573,7 @@ func TestHandleInboxValidManuallyUnFollow(t *testing.T) {
 	}))
 	defer s.Close()
 
-	RelayState.RedisClient.HMSet("relay:pending:"+domain.Host, map[string]interface{}{
+	RelayState.RedisClient.HMSet(context.TODO(), "relay:pending:"+domain.Host, map[string]interface{}{
 		"inbox_url":   actor.Endpoints.SharedInbox,
 		"activity_id": activity.ID,
 		"type":        "Follow",
@@ -592,11 +593,11 @@ func TestHandleInboxValidManuallyUnFollow(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:pending:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:pending:"+domain.Host).Result()
 	if res != 0 {
 		t.Fatalf("fail - pending follow request not deleted")
 	}
-	RelayState.RedisClient.Del("relay:pending:" + domain.Host)
+	RelayState.RedisClient.Del(context.TODO(), "relay:pending:"+domain.Host)
 	RelayState.SetConfig(ManuallyAccept, false)
 }
 
@@ -623,7 +624,7 @@ func TestHandleInboxUnfollowAsActor(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 1 {
 		t.Fatalf("fail - invalid unfollow request should be blocked")
 	}
@@ -653,7 +654,7 @@ func TestHandleInboxUnfollowLitePub(t *testing.T) {
 	if r.StatusCode != 202 {
 		t.Fatalf("fail - StatusCode is not match")
 	}
-	res, _ := RelayState.RedisClient.Exists("relay:subscription:" + domain.Host).Result()
+	res, _ := RelayState.RedisClient.Exists(context.TODO(), "relay:subscription:"+domain.Host).Result()
 	if res != 1 {
 		t.Fatalf("fail - invalid unfollow request should be blocked")
 	}
@@ -689,8 +690,8 @@ func TestHandleInboxValidCreate(t *testing.T) {
 	}
 	RelayState.DelSubscriber(domain.Host)
 	RelayState.DelSubscriber("example.org")
-	RelayState.RedisClient.Del("relay:subscription:" + domain.Host).Result()
-	RelayState.RedisClient.Del("relay:subscription:example.org").Result()
+	RelayState.RedisClient.Del(context.TODO(), "relay:subscription:"+domain.Host).Result()
+	RelayState.RedisClient.Del(context.TODO(), "relay:subscription:example.org").Result()
 }
 
 func TestHandleInboxLimitedCreate(t *testing.T) {
@@ -769,6 +770,6 @@ func TestHandleInboxAnnounceLitePub(t *testing.T) {
 	}
 	RelayState.DelSubscriber(domain.Host)
 	RelayState.DelSubscriber("example.org")
-	RelayState.RedisClient.Del("relay:subscription:" + domain.Host).Result()
-	RelayState.RedisClient.Del("relay:subscription:example.org").Result()
+	RelayState.RedisClient.Del(context.TODO(), "relay:subscription:"+domain.Host).Result()
+	RelayState.RedisClient.Del(context.TODO(), "relay:subscription:example.org").Result()
 }
diff --git a/api/resolver.go b/api/resolver.go
@@ -1,14 +1,16 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
-	uuid "github.com/satori/go.uuid"
+	"net/url"
+	"regexp"
+
+	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
 	"github.com/yukimochi/Activity-Relay/models"
 	"github.com/yukimochi/machinery-v1/v1/tasks"
-	"net/url"
-	"regexp"
 )
 
 func contains(entries interface{}, key string) bool {
@@ -87,15 +89,15 @@ func enqueueRelayActivity(inboxURL string, activityID string) {
 }
 
 func enqueueActivityForAll(sourceDomain string, body []byte) {
-	activityID := uuid.NewV4()
+	activityID := uuid.New()
 	remainCount := len(RelayState.SubscribersAndFollowers) - 1
 
 	if remainCount < 1 {
 		return
 	}
 
 	pushActivityScript := "redis.call('HSET',KEYS[1], 'body', ARGV[1], 'remain_count', ARGV[2]); redis.call('EXPIRE', KEYS[1], ARGV[3]);"
-	RelayState.RedisClient.Eval(pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
+	RelayState.RedisClient.Eval(context.TODO(), pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
 
 	for _, subscription := range RelayState.SubscribersAndFollowers {
 		if sourceDomain == subscription.Domain {
@@ -106,7 +108,7 @@ func enqueueActivityForAll(sourceDomain string, body []byte) {
 }
 
 func enqueueActivityForSubscriber(sourceDomain string, body []byte) {
-	activityID := uuid.NewV4()
+	activityID := uuid.New()
 	remainCount := len(RelayState.Subscribers)
 	if contains(RelayState.Subscribers, sourceDomain) {
 		remainCount = remainCount - 1
@@ -116,7 +118,7 @@ func enqueueActivityForSubscriber(sourceDomain string, body []byte) {
 	}
 
 	pushActivityScript := "redis.call('HSET',KEYS[1], 'body', ARGV[1], 'remain_count', ARGV[2]); redis.call('EXPIRE', KEYS[1], ARGV[3]);"
-	RelayState.RedisClient.Eval(pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
+	RelayState.RedisClient.Eval(context.TODO(), pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
 
 	for _, subscription := range RelayState.Subscribers {
 		if sourceDomain == subscription.Domain {
@@ -127,7 +129,7 @@ func enqueueActivityForSubscriber(sourceDomain string, body []byte) {
 }
 
 func enqueueActivityForFollower(sourceDomain string, body []byte) {
-	activityID := uuid.NewV4()
+	activityID := uuid.New()
 	remainCount := len(RelayState.Followers)
 	if contains(RelayState.Followers, sourceDomain) {
 		remainCount = remainCount - 1
@@ -137,7 +139,7 @@ func enqueueActivityForFollower(sourceDomain string, body []byte) {
 	}
 
 	pushActivityScript := "redis.call('HSET',KEYS[1], 'body', ARGV[1], 'remain_count', ARGV[2]); redis.call('EXPIRE', KEYS[1], ARGV[3]);"
-	RelayState.RedisClient.Eval(pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
+	RelayState.RedisClient.Eval(context.TODO(), pushActivityScript, []string{"relay:activity:" + activityID.String()}, body, remainCount, 2*60).Result()
 
 	for _, subscription := range RelayState.Followers {
 		if sourceDomain == subscription.Domain {
@@ -220,7 +222,7 @@ func executeFollowing(activity *models.Activity, actor *models.Actor) error {
 	switch {
 	case contains(activity.Object, "https://www.w3.org/ns/activitystreams#Public"):
 		if RelayState.RelayConfig.ManuallyAccept {
-			RelayState.RedisClient.HMSet("relay:pending:"+actorID.Host, map[string]interface{}{
+			RelayState.RedisClient.HMSet(context.TODO(), "relay:pending:"+actorID.Host, map[string]interface{}{
 				"inbox_url":   actor.Endpoints.SharedInbox,
 				"activity_id": activity.ID,
 				"type":        "Follow",
@@ -243,7 +245,7 @@ func executeFollowing(activity *models.Activity, actor *models.Actor) error {
 	case contains(activity.Object, RelayActor.ID):
 		if isActorAbleToBeFollower(actorID) {
 			if RelayState.RelayConfig.ManuallyAccept {
-				RelayState.RedisClient.HMSet("relay:pending:"+actorID.Host, map[string]interface{}{
+				RelayState.RedisClient.HMSet(context.TODO(), "relay:pending:"+actorID.Host, map[string]interface{}{
 					"inbox_url":   actor.Endpoints.SharedInbox,
 					"activity_id": activity.ID,
 					"type":        "Follow",

diff --git a/control/config.go b/control/config.go
@@ -2,6 +2,7 @@ package control
 
 import (
 	"encoding/json"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/yukimochi/Activity-Relay/models"

diff --git a/control/config_test.go b/control/config_test.go
@@ -2,14 +2,15 @@ package control
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"os"
 	"strings"
 	"testing"
 )
 
 func TestPersonOnly(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 
@@ -29,7 +30,7 @@ func TestPersonOnly(t *testing.T) {
 }
 
 func TestManuallyAccept(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 
@@ -49,7 +50,7 @@ func TestManuallyAccept(t *testing.T) {
 }
 
 func TestInvalidConfig(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 	buffer := new(bytes.Buffer)
@@ -65,7 +66,7 @@ func TestInvalidConfig(t *testing.T) {
 }
 
 func TestListConfig(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 	buffer := new(bytes.Buffer)
@@ -94,7 +95,7 @@ func TestListConfig(t *testing.T) {
 }
 
 func TestExportConfig(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 	buffer := new(bytes.Buffer)
@@ -115,7 +116,7 @@ func TestExportConfig(t *testing.T) {
 }
 
 func TestImportConfig(t *testing.T) {
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	app := configCmdInit()
 	file, err := os.Open("../misc/test/exampleConfig.json")

diff --git a/control/control_test.go b/control/control_test.go
@@ -1,6 +1,7 @@
 package control
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -34,7 +35,7 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 	RelayState = models.NewState(GlobalConfig.RedisClient(), false)
-	RelayState.RedisClient.FlushAll().Result()
+	RelayState.RedisClient.FlushAll(context.TODO()).Result()
 
 	InitProxy = emptyProxy
 	InitProxyE = emptyProxyE