summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/gotosocial/action/admin/account/account.go4
-rw-r--r--cmd/gotosocial/action/admin/media/list.go4
-rw-r--r--cmd/gotosocial/action/admin/media/prune/common.go4
-rw-r--r--cmd/gotosocial/action/server/server.go64
-rw-r--r--internal/api/client/lists/lists_test.go4
-rw-r--r--internal/cache/cache.go21
-rw-r--r--internal/cache/util.go18
-rw-r--r--internal/config/util.go39
-rw-r--r--internal/transport/delivery/worker_test.go9
9 files changed, 86 insertions, 81 deletions
diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go
index 7dfb6b1d4..aa241177d 100644
--- a/cmd/gotosocial/action/admin/account/account.go
+++ b/cmd/gotosocial/action/admin/account/account.go
@@ -38,7 +38,9 @@ import (
func initState(ctx context.Context) (*state.State, error) {
var state state.State
state.Caches.Init()
- state.Caches.Start()
+ if err := state.Caches.Start(); err != nil {
+ return nil, fmt.Errorf("error starting caches: %w", err)
+ }
// Only set state DB connection.
// Don't need Actions or Workers for this (yet).
diff --git a/cmd/gotosocial/action/admin/media/list.go b/cmd/gotosocial/action/admin/media/list.go
index a017539ed..e80c0da51 100644
--- a/cmd/gotosocial/action/admin/media/list.go
+++ b/cmd/gotosocial/action/admin/media/list.go
@@ -125,7 +125,9 @@ func setupList(ctx context.Context) (*list, error) {
}
state.Caches.Init()
- state.Caches.Start()
+ if err := state.Caches.Start(); err != nil {
+ return nil, fmt.Errorf("error starting caches: %w", err)
+ }
// Only set state DB connection.
// Don't need Actions or Workers for this.
diff --git a/cmd/gotosocial/action/admin/media/prune/common.go b/cmd/gotosocial/action/admin/media/prune/common.go
index d73676f5b..fce445fb0 100644
--- a/cmd/gotosocial/action/admin/media/prune/common.go
+++ b/cmd/gotosocial/action/admin/media/prune/common.go
@@ -42,7 +42,9 @@ func setupPrune(ctx context.Context) (*prune, error) {
var state state.State
state.Caches.Init()
- state.Caches.Start()
+ if err := state.Caches.Start(); err != nil {
+ return nil, fmt.Errorf("error starting caches: %w", err)
+ }
// Scheduler is required for the
// cleaner, but no other workers
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index 3c37c6ff6..8c4fad247 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -22,6 +22,7 @@ import (
"errors"
"fmt"
"net/http"
+ "net/netip"
"os"
"os/signal"
"runtime"
@@ -117,8 +118,9 @@ var Start action.GTSAction = func(ctx context.Context) error {
)
defer func() {
- // Stop caches with
- // background tasks.
+ // Stop any started caches.
+ //
+ // Noop if never started.
state.Caches.Stop()
if route != nil {
@@ -133,6 +135,8 @@ var Start action.GTSAction = func(ctx context.Context) error {
// Stop any currently running
// worker processes / scheduled
// tasks from being executed.
+ //
+ // Noop on unstarted workers.
state.Workers.Stop()
if state.Timelines.Home != nil {
@@ -202,7 +206,9 @@ var Start action.GTSAction = func(ctx context.Context) error {
// Initialize caches
state.Caches.Init()
- state.Caches.Start()
+ if err := state.Caches.Start(); err != nil {
+ return fmt.Errorf("error starting caches: %w", err)
+ }
// Open connection to the database now caches started.
dbService, err := bundb.NewBunDBService(ctx, state)
@@ -240,10 +246,17 @@ var Start action.GTSAction = func(ctx context.Context) error {
return fmt.Errorf("error opening storage backend: %w", err)
}
+ // Parse http client allow
+ // and block range exceptions.
+ ranges, err := parseClientRanges()
+ if err != nil {
+ return err
+ }
+
// Prepare wrapped httpclient with config.
client := httpclient.New(httpclient.Config{
- AllowRanges: config.MustParseIPPrefixes(config.GetHTTPClientAllowIPs()),
- BlockRanges: config.MustParseIPPrefixes(config.GetHTTPClientBlockIPs()),
+ AllowRanges: ranges.allow,
+ BlockRanges: ranges.block,
Timeout: config.GetHTTPClientTimeout(),
TLSInsecureSkipVerify: config.GetHTTPClientTLSInsecureSkipVerify(),
})
@@ -617,3 +630,44 @@ func compileWASM(ctx context.Context) error {
return nil
}
+
+func parseClientRanges() (
+ *struct {
+ allow []netip.Prefix
+ block []netip.Prefix
+ },
+ error,
+) {
+ parseF := func(ips []string, ranges []netip.Prefix, flag string) error {
+ for i, ip := range ips {
+ p, err := netip.ParsePrefix(ip)
+ if err != nil {
+ return fmt.Errorf("error parsing %s value %s: %w", flag, ip, err)
+ }
+ ranges[i] = p
+ }
+ return nil
+ }
+
+ allowIPs := config.GetHTTPClientAllowIPs()
+ allowRanges := make([]netip.Prefix, len(allowIPs))
+ allowFlag := config.HTTPClientAllowIPsFlag()
+ if err := parseF(allowIPs, allowRanges, allowFlag); err != nil {
+ return nil, err
+ }
+
+ blockIPs := config.GetHTTPClientBlockIPs()
+ blockRanges := make([]netip.Prefix, len(blockIPs))
+ blockFlag := config.HTTPClientBlockIPsFlag()
+ if err := parseF(blockIPs, blockRanges, blockFlag); err != nil {
+ return nil, err
+ }
+
+ return &struct {
+ allow []netip.Prefix
+ block []netip.Prefix
+ }{
+ allow: allowRanges,
+ block: blockRanges,
+ }, nil
+}
diff --git a/internal/api/client/lists/lists_test.go b/internal/api/client/lists/lists_test.go
index 65242db25..a4afa24bb 100644
--- a/internal/api/client/lists/lists_test.go
+++ b/internal/api/client/lists/lists_test.go
@@ -76,7 +76,9 @@ func (suite *ListsStandardTestSuite) SetupSuite() {
func (suite *ListsStandardTestSuite) SetupTest() {
suite.state.Caches.Init()
- suite.state.Caches.Start()
+ if err := suite.state.Caches.Start(); err != nil {
+ panic("error starting caches: " + err.Error())
+ }
testrig.StartNoopWorkers(&suite.state)
testrig.InitTestConfig()
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
index e57fbb569..88e4f870a 100644
--- a/internal/cache/cache.go
+++ b/internal/cache/cache.go
@@ -23,6 +23,7 @@ import (
"codeberg.org/gruf/go-cache/v3/ttl"
"github.com/superseriousbusiness/gotosocial/internal/cache/headerfilter"
"github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/log"
)
@@ -124,16 +125,18 @@ func (c *Caches) Init() {
// Start will start any caches that require a background
// routine, which usually means any kind of TTL caches.
-func (c *Caches) Start() {
+func (c *Caches) Start() error {
log.Infof(nil, "start: %p", c)
- tryUntil("starting webfinger cache", 5, func() bool {
- return c.Webfinger.Start(5 * time.Minute)
- })
+ if !c.Webfinger.Start(5 * time.Minute) {
+ return gtserror.New("could not start webfinger cache")
+ }
- tryUntil("starting statusesFilterableFields cache", 5, func() bool {
- return c.StatusesFilterableFields.Start(5 * time.Minute)
- })
+ if !c.StatusesFilterableFields.Start(5 * time.Minute) {
+ return gtserror.New("could not start statusesFilterableFields cache")
+ }
+
+ return nil
}
// Stop will stop any caches that require a background
@@ -141,8 +144,8 @@ func (c *Caches) Start() {
func (c *Caches) Stop() {
log.Infof(nil, "stop: %p", c)
- tryUntil("stopping webfinger cache", 5, c.Webfinger.Stop)
- tryUntil("stopping statusesFilterableFields cache", 5, c.StatusesFilterableFields.Stop)
+ _ = c.Webfinger.Stop()
+ _ = c.StatusesFilterableFields.Stop()
}
// Sweep will sweep all the available caches to ensure none
diff --git a/internal/cache/util.go b/internal/cache/util.go
index fde2f9ada..ceb053e34 100644
--- a/internal/cache/util.go
+++ b/internal/cache/util.go
@@ -19,11 +19,9 @@ package cache
import (
"errors"
- "time"
errorsv2 "codeberg.org/gruf/go-errors/v2"
"github.com/superseriousbusiness/gotosocial/internal/db"
- "github.com/superseriousbusiness/gotosocial/internal/log"
)
// SentinelError is an error that can be returned and checked against to indicate a non-permanent
@@ -51,19 +49,3 @@ type nocopy struct{}
func (*nocopy) Lock() {}
func (*nocopy) Unlock() {}
-
-// tryUntil will attempt to call 'do' for 'count' attempts, before panicking with 'msg'.
-func tryUntil(msg string, count int, do func() bool) {
- for i := 0; i < count; i++ {
- if do() {
- // success.
- return
- }
-
- // Sleep for a little before retry (a bcakoff).
- time.Sleep(time.Millisecond * 1 << (i + 1))
- }
-
- // panic on total failure as this shouldn't happen.
- log.Panicf(nil, "failed %s after %d tries", msg, count)
-}
diff --git a/internal/config/util.go b/internal/config/util.go
deleted file mode 100644
index a9df08b3c..000000000
--- a/internal/config/util.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-package config
-
-import (
- "net/netip"
-
- "github.com/superseriousbusiness/gotosocial/internal/log"
-)
-
-func MustParseIPPrefixes(in []string) []netip.Prefix {
- prefs := make([]netip.Prefix, 0, len(in))
-
- for _, i := range in {
- pref, err := netip.ParsePrefix(i)
- if err != nil {
- log.Panicf(nil, "error parsing ip prefix from %q: %v", i, err)
- }
-
- prefs = append(prefs, pref)
- }
-
- return prefs
-}
diff --git a/internal/transport/delivery/worker_test.go b/internal/transport/delivery/worker_test.go
index 192ffcd37..72f485e68 100644
--- a/internal/transport/delivery/worker_test.go
+++ b/internal/transport/delivery/worker_test.go
@@ -24,11 +24,11 @@ import (
"math/rand"
"net"
"net/http"
+ "net/netip"
"strconv"
"strings"
"testing"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
"github.com/superseriousbusiness/gotosocial/internal/queue"
"github.com/superseriousbusiness/gotosocial/internal/transport/delivery"
@@ -44,11 +44,8 @@ func TestDeliveryWorkerPool(t *testing.T) {
func testDeliveryWorkerPool(t *testing.T, sz int, input []*testrequest) {
wp := new(delivery.WorkerPool)
- wp.Init(httpclient.New(httpclient.Config{
- AllowRanges: config.MustParseIPPrefixes([]string{
- "127.0.0.0/8",
- }),
- }))
+ allowLocal := []netip.Prefix{netip.MustParsePrefix("127.0.0.0/8")}
+ wp.Init(httpclient.New(httpclient.Config{AllowRanges: allowLocal}))
wp.Start(sz)
defer wp.Stop()
test(t, &wp.Queue, input)
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-02 06:05:46 +0000