Move httpsig algs constant slice to modules/setting/federation.go

modules/activitypub/client.go

@@ -55,15 +55,6 @@ type Client struct {
 	pubID       string
 }
 
-var algos []httpsig.Algorithm
-
-func init() {
-	algos = make([]httpsig.Algorithm, len(setting.Federation.Algorithms))
-	for i, algo := range setting.Federation.Algorithms {
-		algos[i] = httpsig.Algorithm(algo)
-	}
-}
-
 // NewClient function
 func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
 	if err = containsRequiredHTTPHeaders(http.MethodGet, setting.Federation.GetHeaders); err != nil {
@@ -88,7 +79,7 @@ func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
 				Proxy: proxy.Proxy(),
 			},
 		},
-		algs:        algos,
+		algs:        setting.HttpsigAlgs,
 		digestAlg:   httpsig.DigestAlgorithm(setting.Federation.DigestAlgorithm),
 		getHeaders:  setting.Federation.GetHeaders,
 		postHeaders: setting.Federation.PostHeaders,

modules/setting/federation.go

@@ -29,6 +29,9 @@ var (
 	}
 )
 
+// Constant slice of httpsig algorithm objects
+var HttpsigAlgs []httpsig.Algorithm
+
 func newFederationService() {
 	if err := Cfg.Section("federation").MapTo(&Federation); err != nil {
 		log.Fatal("Failed to map Federation settings: %v", err)
@@ -36,4 +39,9 @@ func newFederationService() {
 		log.Fatal("unsupported digest algorithm: %s", Federation.DigestAlgorithm)
 		return
 	}
+
+	HttpsigAlgs = make([]httpsig.Algorithm, len(Federation.Algorithms))
+	for i, alg := range Federation.Algorithms {
+		HttpsigAlgs[i] = httpsig.Algorithm(alg)
+	}
 }