From 1d68f9506bc4cc32b039ad9afcab4d37d8b53ed7 Mon Sep 17 00:00:00 2001 From: tgiachi Date: Tue, 10 Nov 2026 15:54:29 +0100 Subject: [PATCH 1/3] ci: describe the runner the workflows expect - ci.yaml asks for a docker-labelled runner and runs jobs in the named containers - e2e.yaml says what it needs from a runner and that it has not been run on one --- .forgejo/workflows/ci.yaml | 4 ++-- .forgejo/workflows/e2e.yaml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 89f08cd..faafb60 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -1,5 +1,5 @@ -# Runs on Forgejo Actions (Codeberg). Enable Actions in the repository settings and make sure -# a runner with the `docker` label is available; change `runs-on` if yours is named differently. +# Runs on Forgejo Actions. The jobs ask for a runner labelled `docker` that runs each job in the +# container named below; change `runs-on` if your runner is labelled differently. name: ci on: diff --git a/.forgejo/workflows/e2e.yaml b/.forgejo/workflows/e2e.yaml index 16bcf76..9d29f8d 100644 --- a/.forgejo/workflows/e2e.yaml +++ b/.forgejo/workflows/e2e.yaml @@ -1,5 +1,8 @@ # The end-to-end test starts Postfix and parsimony in Docker, so it needs a runner that can run -# Docker itself. Start it by hand from the Actions tab (or run `make e2e` locally). +# Docker itself, with the job on the host network (it talks to published ports on 127.0.0.1 and +# mounts temporary directories). A plain `docker` runner does not give a job a Docker daemon, and +# I have not run this workflow on a runner: use `make e2e` locally. Start it by hand from the +# Actions tab only once you have such a runner. name: e2e on: From a10616e216680d2242726f90b76db8967eaf36df Mon Sep 17 00:00:00 2001 From: tgiachi Date: Tue, 10 Nov 2026 15:57:29 +0100 Subject: [PATCH 2/3] ci: install Node in the golang jobs so the checkout action can run - The golang image has no Node, and actions/checkout is a Node action - The first run on my runner failed in the go and vuln jobs for this reason --- .forgejo/workflows/ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index faafb60..d9854ea 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: runs-on: docker container: golang:1.27 steps: + # The checkout action runs on Node, which the golang image does not carry. + - name: Install Node + run: apt-get update -qq && apt-get install -y -qq nodejs git - uses: actions/checkout@v4 - run: make go-ci @@ -28,5 +31,8 @@ jobs: runs-on: docker container: golang:1.27 steps: + # The checkout action runs on Node, which the golang image does not carry. + - name: Install Node + run: apt-get update -qq && apt-get install -y -qq nodejs git - uses: actions/checkout@v4 - run: make vuln From 93a3edc58fc74e133c4d1efdd786d00d0bac5c5f Mon Sep 17 00:00:00 2001 From: tgiachi Date: Mon, 16 Nov 2026 09:40:48 +0100 Subject: [PATCH 3/3] chore: move the module to git.kmalloc.org and track cmd/parsimony - Rename the Go module from codeberg.org/squidd/parsimony to git.kmalloc.org/squid/parsimony in go.mod and every import. - Fix .gitignore: the bare `parsimony` pattern also ignored the cmd/parsimony folder, so the main package was never committed and a clean checkout could not be built. Anchor it to the root (`/parsimony`) and add cmd/parsimony. --- .gitignore | 2 +- cmd/parsimony/dispatch_test.go | 35 +++++++++++++++ cmd/parsimony/main.go | 75 +++++++++++++++++++++++++++++++ cmd/parsimony/token.go | 28 ++++++++++++ cmd/parsimony/token_test.go | 42 +++++++++++++++++ go.mod | 2 +- internal/api/api.go | 4 +- internal/api/api_test.go | 2 +- internal/api/limit_test.go | 2 +- internal/api/posts_test.go | 2 +- internal/app/app.go | 20 ++++----- internal/app/app_test.go | 4 +- internal/archive/import.go | 4 +- internal/archive/import_test.go | 2 +- internal/cli/cli_test.go | 6 +-- internal/cli/dkim.go | 2 +- internal/cli/posts_test.go | 2 +- internal/ingest/ingest.go | 2 +- internal/ingest/ingest_test.go | 8 ++-- internal/ingest/publisher_test.go | 2 +- internal/queue/posts_test.go | 4 +- internal/queue/queue.go | 4 +- internal/queue/queue_test.go | 4 +- internal/router/commands.go | 2 +- internal/router/headers.go | 2 +- internal/router/identity_test.go | 2 +- internal/router/m2_test.go | 6 +-- internal/router/m3_test.go | 2 +- internal/router/priority_test.go | 2 +- internal/router/publisher_test.go | 2 +- internal/router/router.go | 4 +- internal/router/router_test.go | 2 +- internal/web/web.go | 8 ++-- internal/web/web_test.go | 10 ++--- scale/scale_test.go | 10 ++--- 35 files changed, 245 insertions(+), 65 deletions(-) create mode 100644 cmd/parsimony/dispatch_test.go create mode 100644 cmd/parsimony/main.go create mode 100644 cmd/parsimony/token.go create mode 100644 cmd/parsimony/token_test.go diff --git a/.gitignore b/.gitignore index 835326d..205ba60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -parsimony +/parsimony *.db *.db-* admin/node_modules diff --git a/cmd/parsimony/dispatch_test.go b/cmd/parsimony/dispatch_test.go new file mode 100644 index 0000000..eed81c0 --- /dev/null +++ b/cmd/parsimony/dispatch_test.go @@ -0,0 +1,35 @@ +package main + +import ( + "reflect" + "testing" +) + +func TestServeArgs(t *testing.T) { + cases := []struct { + name string + args []string + want []string + serve bool + }{ + {"explicit serve", []string{"serve"}, []string{}, true}, + {"explicit serve with flags", []string{"serve", "-config", "x.yaml"}, []string{"-config", "x.yaml"}, true}, + {"legacy -config", []string{"-config", "x.yaml"}, []string{"-config", "x.yaml"}, true}, + {"legacy --config", []string{"--config", "x.yaml"}, []string{"--config", "x.yaml"}, true}, + {"legacy -config=", []string{"-config=x.yaml"}, []string{"-config=x.yaml"}, true}, + {"legacy --config=", []string{"--config=x.yaml"}, []string{"--config=x.yaml"}, true}, + {"admin command", []string{"list", "ls"}, nil, false}, + {"global flag then admin command", []string{"--json", "list", "ls"}, nil, false}, + {"url flag", []string{"--url", "http://x", "queue", "ls"}, nil, false}, + {"help", []string{"help"}, nil, false}, + {"nothing", nil, nil, false}, + {"serve is only a command name in first position", []string{"list", "serve"}, nil, false}, + {"a list called serve@x is not the serve command", []string{"list", "show", "serve@example.org"}, nil, false}, + } + for _, c := range cases { + got, ok := serveArgs(c.args) + if ok != c.serve || (ok && !reflect.DeepEqual(got, c.want)) { + t.Errorf("%s: serveArgs(%v) = %v, %v; want %v, %v", c.name, c.args, got, ok, c.want, c.serve) + } + } +} diff --git a/cmd/parsimony/main.go b/cmd/parsimony/main.go new file mode 100644 index 0000000..696dd60 --- /dev/null +++ b/cmd/parsimony/main.go @@ -0,0 +1,75 @@ +// Command parsimony runs the mailing list daemon and administers it. +// +// parsimony serve [-config FILE] run the server +// parsimony list|member|... command-line client (see "parsimony help") +package main + +import ( + "flag" + "log" + "os" + "os/signal" + "strings" + "syscall" + + "git.kmalloc.org/squid/parsimony/internal/app" + "git.kmalloc.org/squid/parsimony/internal/cli" + "git.kmalloc.org/squid/parsimony/internal/config" +) + +// serveArgs reports whether the invocation starts the server and returns its flags. +// "parsimony -config FILE" (before the serve subcommand existed) still works. +func serveArgs(args []string) ([]string, bool) { + if len(args) == 0 { + return nil, false + } + if args[0] == "serve" { + return args[1:], true + } + if a := args[0]; a == "-config" || a == "--config" || strings.HasPrefix(a, "-config=") || strings.HasPrefix(a, "--config=") { + return args, true + } + return nil, false +} + +func main() { + if args, ok := serveArgs(os.Args[1:]); ok { + serve(args) + return + } + os.Exit(cli.Run(os.Args[1:], cli.IO{In: os.Stdin, Out: os.Stdout, Err: os.Stderr}, os.Getenv)) +} + +func serve(args []string) { + fs := flag.NewFlagSet("parsimony serve", flag.ExitOnError) + cfgPath := fs.String("config", "parsimony.yaml", "path to the YAML config file") + fs.Parse(args) + + cfg, err := config.Load(*cfgPath) + if err != nil { + log.Fatalf("config: %v", err) + } + token := os.Getenv("PARSIMONY_API_TOKEN") + if err := checkAPIToken(token); err != nil { + log.Fatal(err) + } + a, err := app.Start(cfg, token) + if err != nil { + log.Fatal(err) + } + log.Printf("LMTP listening on %s %s", cfg.LMTP.Network, a.LMTPAddr) + if a.APIAddr != "" { + log.Printf("API listening on %s", a.APIAddr) + } else { + log.Println("PARSIMONY_API_TOKEN is not set: REST API disabled") + } + if a.WebAddr != "" { + log.Printf("web listening on %s", a.WebAddr) + } + + stop := make(chan os.Signal, 1) + signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM) + <-stop + log.Println("shutting down") + a.Close() +} diff --git a/cmd/parsimony/token.go b/cmd/parsimony/token.go new file mode 100644 index 0000000..08468e7 --- /dev/null +++ b/cmd/parsimony/token.go @@ -0,0 +1,28 @@ +package main + +import ( + "fmt" + "unicode" +) + +// minTokenLength keeps the bearer token out of reach of guessing: 24 random characters. +const minTokenLength = 24 + +// checkAPIToken refuses a weak or malformed API token. An empty token is fine: the API is then disabled. +func checkAPIToken(token string) error { + if token == "" { + return nil + } + for _, r := range token { + switch { + case unicode.IsSpace(r): + return fmt.Errorf("PARSIMONY_API_TOKEN contains whitespace (a trailing newline from a file?): remove it") + case unicode.IsControl(r): + return fmt.Errorf("PARSIMONY_API_TOKEN contains a control character") + } + } + if len(token) < minTokenLength { + return fmt.Errorf("PARSIMONY_API_TOKEN is too short (%d characters): use at least %d random characters, for example the output of `openssl rand -hex 24`", len(token), minTokenLength) + } + return nil +} diff --git a/cmd/parsimony/token_test.go b/cmd/parsimony/token_test.go new file mode 100644 index 0000000..6f93255 --- /dev/null +++ b/cmd/parsimony/token_test.go @@ -0,0 +1,42 @@ +package main + +import ( + "strings" + "testing" +) + +func TestCheckAPIToken(t *testing.T) { + good := strings.Repeat("a", 24) + for name, tc := range map[string]struct { + token string + wantErr string // substring; "" means the token is fine + }{ + "not set (API disabled)": {"", ""}, + "24 characters": {good, ""}, + "long": {strings.Repeat("x", 100), ""}, + "23 characters": {good[:23], "at least 24"}, + "a short word": {"tok", "at least 24"}, + "trailing newline": {good + "\n", "whitespace"}, + "inner space": {good[:12] + " " + good[12:], "whitespace"}, + "tab": {good + "\t", "whitespace"}, + "control character": {good + "\x00", "control"}, + } { + err := checkAPIToken(tc.token) + switch { + case tc.wantErr == "" && err != nil: + t.Errorf("%s: unexpected error %v", name, err) + case tc.wantErr != "" && (err == nil || !strings.Contains(err.Error(), tc.wantErr)): + t.Errorf("%s: want an error containing %q, got %v", name, tc.wantErr, err) + } + } +} + +func TestTheTokenErrorSaysHowToMakeOne(t *testing.T) { + err := checkAPIToken("Zq9Xv7Kp") + if err == nil || !strings.Contains(err.Error(), "openssl rand -hex 24") || !strings.Contains(err.Error(), "PARSIMONY_API_TOKEN") { + t.Fatalf("%v", err) + } + if strings.Contains(err.Error(), "Zq9Xv7Kp") { + t.Fatal("never echo the token") + } +} diff --git a/go.mod b/go.mod index a8827ff..a28c27c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module codeberg.org/squidd/parsimony +module git.kmalloc.org/squid/parsimony go 1.27.3 diff --git a/internal/api/api.go b/internal/api/api.go index ce8ed0b..1259973 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -15,8 +15,8 @@ import ( "unicode" "unicode/utf8" - "codeberg.org/squidd/parsimony/internal/archive" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/archive" + "git.kmalloc.org/squid/parsimony/internal/store" ) // Releaser approves a held message: it delivers it to the list. diff --git a/internal/api/api_test.go b/internal/api/api_test.go index 685971c..5c92db2 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) const token = "s3cret" diff --git a/internal/api/limit_test.go b/internal/api/limit_test.go index 8687d16..d765e66 100644 --- a/internal/api/limit_test.go +++ b/internal/api/limit_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) type clock struct { diff --git a/internal/api/posts_test.go b/internal/api/posts_test.go index 1e1b9dc..99bdfd6 100644 --- a/internal/api/posts_test.go +++ b/internal/api/posts_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) type postJSON struct { diff --git a/internal/app/app.go b/internal/app/app.go index 0ac8bf6..7120771 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -14,16 +14,16 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/adminui" - "codeberg.org/squidd/parsimony/internal/api" - "codeberg.org/squidd/parsimony/internal/config" - "codeberg.org/squidd/parsimony/internal/dkimsign" - "codeberg.org/squidd/parsimony/internal/ingest" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/queue" - "codeberg.org/squidd/parsimony/internal/router" - "codeberg.org/squidd/parsimony/internal/store" - "codeberg.org/squidd/parsimony/internal/web" + "git.kmalloc.org/squid/parsimony/internal/adminui" + "git.kmalloc.org/squid/parsimony/internal/api" + "git.kmalloc.org/squid/parsimony/internal/config" + "git.kmalloc.org/squid/parsimony/internal/dkimsign" + "git.kmalloc.org/squid/parsimony/internal/ingest" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/queue" + "git.kmalloc.org/squid/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/web" ) // shutdownTimeout bounds how long Close waits for the sessions in flight before it cuts them. diff --git a/internal/app/app_test.go b/internal/app/app_test.go index 4744fd6..d87a7b1 100644 --- a/internal/app/app_test.go +++ b/internal/app/app_test.go @@ -31,8 +31,8 @@ import ( "github.com/emersion/go-sasl" "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/config" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/config" + "git.kmalloc.org/squid/parsimony/internal/store" ) // sink is a fake SMTP relay that records what it receives. diff --git a/internal/archive/import.go b/internal/archive/import.go index ce2a4c5..2fd71fb 100644 --- a/internal/archive/import.go +++ b/internal/archive/import.go @@ -6,8 +6,8 @@ import ( "io" "time" - "codeberg.org/squidd/parsimony/internal/mbox" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/mbox" + "git.kmalloc.org/squid/parsimony/internal/store" ) const ( diff --git a/internal/archive/import_test.go b/internal/archive/import_test.go index 6526227..08a385a 100644 --- a/internal/archive/import_test.go +++ b/internal/archive/import_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) var importNow = time.Date(2031, 5, 6, 7, 8, 9, 0, time.UTC) diff --git a/internal/cli/cli_test.go b/internal/cli/cli_test.go index 3754b25..f03d4fa 100644 --- a/internal/cli/cli_test.go +++ b/internal/cli/cli_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/api" - "codeberg.org/squidd/parsimony/internal/dkimsign" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/api" + "git.kmalloc.org/squid/parsimony/internal/dkimsign" + "git.kmalloc.org/squid/parsimony/internal/store" ) const token = "cli-token" diff --git a/internal/cli/dkim.go b/internal/cli/dkim.go index 1574cce..1011dc7 100644 --- a/internal/cli/dkim.go +++ b/internal/cli/dkim.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "codeberg.org/squidd/parsimony/internal/dkimsign" + "git.kmalloc.org/squid/parsimony/internal/dkimsign" ) // lookupTXT resolves DNS TXT records; tests replace it. diff --git a/internal/cli/posts_test.go b/internal/cli/posts_test.go index ed8b597..247be2d 100644 --- a/internal/cli/posts_test.go +++ b/internal/cli/posts_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) func TestPostsLs(t *testing.T) { diff --git a/internal/ingest/ingest.go b/internal/ingest/ingest.go index 953300f..3a4088a 100644 --- a/internal/ingest/ingest.go +++ b/internal/ingest/ingest.go @@ -9,7 +9,7 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/router" ) const maxMessageBytes = 25 << 20 diff --git a/internal/ingest/ingest_test.go b/internal/ingest/ingest_test.go index fa8be14..8690351 100644 --- a/internal/ingest/ingest_test.go +++ b/internal/ingest/ingest_test.go @@ -10,10 +10,10 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/queue" - "codeberg.org/squidd/parsimony/internal/router" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/queue" + "git.kmalloc.org/squid/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/store" ) const msg = "From: Alice \r\nSubject: hi\r\n\r\nbody\r\n" diff --git a/internal/ingest/publisher_test.go b/internal/ingest/publisher_test.go index 384e68f..6e8321b 100644 --- a/internal/ingest/publisher_test.go +++ b/internal/ingest/publisher_test.go @@ -7,7 +7,7 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) func TestANonPublisherIsRefusedPermanentlyByANewsletter(t *testing.T) { diff --git a/internal/queue/posts_test.go b/internal/queue/posts_test.go index 3736527..ea66764 100644 --- a/internal/queue/posts_test.go +++ b/internal/queue/posts_test.go @@ -7,8 +7,8 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/store" ) // post queues a post of n recipients (a@x.com, b@x.com...) to a new list and returns the list. diff --git a/internal/queue/queue.go b/internal/queue/queue.go index aad7fb6..8139c85 100644 --- a/internal/queue/queue.go +++ b/internal/queue/queue.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/store" ) // MaxAge is how long a failing delivery is retried before it is dropped. diff --git a/internal/queue/queue_test.go b/internal/queue/queue_test.go index abd1c29..a74d983 100644 --- a/internal/queue/queue_test.go +++ b/internal/queue/queue_test.go @@ -11,8 +11,8 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/store" ) var t0 = time.Unix(1_900_000_000, 0) diff --git a/internal/router/commands.go b/internal/router/commands.go index b8c621a..4cf2e12 100644 --- a/internal/router/commands.go +++ b/internal/router/commands.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) func (r *Router) secret() ([]byte, error) { diff --git a/internal/router/headers.go b/internal/router/headers.go index 49a3585..30ed393 100644 --- a/internal/router/headers.go +++ b/internal/router/headers.go @@ -11,7 +11,7 @@ import ( "github.com/emersion/go-message/textproto" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) // rewrite adds the list headers shared by every recipient and rewrites From so DMARC alignment holds. diff --git a/internal/router/identity_test.go b/internal/router/identity_test.go index d4431ea..ff1405a 100644 --- a/internal/router/identity_test.go +++ b/internal/router/identity_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) func postFrom(from string) []byte { diff --git a/internal/router/m2_test.go b/internal/router/m2_test.go index 92c96c7..c371e7f 100644 --- a/internal/router/m2_test.go +++ b/internal/router/m2_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/queue" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/queue" + "git.kmalloc.org/squid/parsimony/internal/store" ) type env struct { diff --git a/internal/router/m3_test.go b/internal/router/m3_test.go index 803235f..090e3c2 100644 --- a/internal/router/m3_test.go +++ b/internal/router/m3_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) const post = "From: Alice Smith \r\nTo: dev@example.org\r\nSubject: Hello list\r\n" + diff --git a/internal/router/priority_test.go b/internal/router/priority_test.go index ceab018..65b4efa 100644 --- a/internal/router/priority_test.go +++ b/internal/router/priority_test.go @@ -3,7 +3,7 @@ package router import ( "testing" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) // priorityEnv is newEnv with the publishers post policy, for the delivery priority tests. diff --git a/internal/router/publisher_test.go b/internal/router/publisher_test.go index c80f3db..417d683 100644 --- a/internal/router/publisher_test.go +++ b/internal/router/publisher_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) // newsletterEnv is the test list with the publishers post policy and alice as its only publisher. diff --git a/internal/router/router.go b/internal/router/router.go index 71230ac..e8538bb 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "codeberg.org/squidd/parsimony/internal/archive" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/archive" + "git.kmalloc.org/squid/parsimony/internal/store" ) var ( diff --git a/internal/router/router_test.go b/internal/router/router_test.go index 5e12516..5bf3a74 100644 --- a/internal/router/router_test.go +++ b/internal/router/router_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/store" ) func setup(t *testing.T) *Router { diff --git a/internal/web/web.go b/internal/web/web.go index ae06a79..ee28529 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -16,10 +16,10 @@ import ( "time" "unicode" - "codeberg.org/squidd/parsimony/assets" - "codeberg.org/squidd/parsimony/internal/archive" - "codeberg.org/squidd/parsimony/internal/router" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/assets" + "git.kmalloc.org/squid/parsimony/internal/archive" + "git.kmalloc.org/squid/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/store" ) const pageSize = 25 diff --git a/internal/web/web_test.go b/internal/web/web_test.go index f48340e..fb13075 100644 --- a/internal/web/web_test.go +++ b/internal/web/web_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "codeberg.org/squidd/parsimony/assets" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/queue" - "codeberg.org/squidd/parsimony/internal/router" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/assets" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/queue" + "git.kmalloc.org/squid/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/store" ) type fixture struct { diff --git a/scale/scale_test.go b/scale/scale_test.go index 145b0d0..93d7c1e 100644 --- a/scale/scale_test.go +++ b/scale/scale_test.go @@ -22,11 +22,11 @@ import ( "github.com/emersion/go-smtp" - "codeberg.org/squidd/parsimony/internal/archive" - "codeberg.org/squidd/parsimony/internal/outbound" - "codeberg.org/squidd/parsimony/internal/queue" - "codeberg.org/squidd/parsimony/internal/router" - "codeberg.org/squidd/parsimony/internal/store" + "git.kmalloc.org/squid/parsimony/internal/archive" + "git.kmalloc.org/squid/parsimony/internal/outbound" + "git.kmalloc.org/squid/parsimony/internal/queue" + "git.kmalloc.org/squid/parsimony/internal/router" + "git.kmalloc.org/squid/parsimony/internal/store" ) func openStore(t *testing.T) *store.Store {