24c0aad9bf · krz/gitbay

.gitignore +2 −2

		@@ -1,3 +1,3 @@
1		/forge
2		/forged
	1	/gitbay
	2	/gitbayd
3	3	*.db

cmd/forge/local.go → cmd/gitbay/local.go renamed +18 −18

		@@ -9,8 +9,8 @@ import (
9	9
10	10	"golang.org/x/term"
11	11
12		"github.com/krazywarez/forge/internal/cliconfig"
13		"github.com/krazywarez/forge/internal/protocol"
	12	"gitbay.org/gitbay/internal/cliconfig"
	13	"gitbay.org/gitbay/internal/protocol"
14	14	)
15	15
16	16	// hasBodyFlag reports whether args already carry body/message input.
		@@ -37,7 +37,7 @@ func maybeEditor(args []string, kind string) ([]string, *strings.Reader, bool, e
37	37	// failing — bodies are optional everywhere.
38	38	return args, nil, true, nil
39	39	}
40		f, err := os.CreateTemp("", "forge-"+kind+"-*.md")
	40	f, err := os.CreateTemp("", "gitbay-"+kind+"-*.md")
41	41	if err != nil {
42	42	return nil, nil, false, err
43	43	}
		@@ -75,7 +75,7 @@ func runGitLocal(args ...string) int {
75	75	if ee, ok := err.(*exec.ExitError); ok {
76	76	return ee.ExitCode()
77	77	}
78		fmt.Fprintln(os.Stderr, "forge:", err)
	78	fmt.Fprintln(os.Stderr, "gitbay:", err)
79	79	return protocol.ExitFailure
80	80	}
81	81	return 0
		@@ -84,12 +84,12 @@ func runGitLocal(args ...string) int {
84	84	// cmdRepoClone implements `forge repo clone <owner/name> [dir]`.
85	85	func cmdRepoClone(args []string) int {
86	86	if len(args) < 1 \|\| strings.HasPrefix(args[0], "-") {
87		fmt.Fprintln(os.Stderr, "usage: forge repo clone <owner/name> [dir]")
	87	fmt.Fprintln(os.Stderr, "usage: gitbay repo clone <owner/name> [dir]")
88	88	return protocol.ExitUsage
89	89	}
90	90	t, err := resolveTarget()
91	91	if err != nil {
92		fmt.Fprintln(os.Stderr, "forge:", err)
	92	fmt.Fprintln(os.Stderr, "gitbay:", err)
93	93	return protocol.ExitFailure
94	94	}
95	95	gitArgs := append([]string{"clone", t.inst.CloneURL(args[0])}, args[1:]...)
		@@ -103,7 +103,7 @@ func cmdRepoClone(args []string) int {
103	103	// origin and check it out as a local branch.
104	104	func cmdMRCheckout(args []string) int {
105	105	if len(args) != 1 {
106		fmt.Fprintln(os.Stderr, "usage: forge mr checkout <n>")
	106	fmt.Fprintln(os.Stderr, "usage: gitbay mr checkout <n>")
107	107	return protocol.ExitUsage
108	108	}
109	109	n := args[0]
		@@ -124,7 +124,7 @@ func cmdInit(args []string) int {
124	124	case a == "--private":
125	125	private = true
126	126	case strings.HasPrefix(a, "-"):
127		fmt.Fprintln(os.Stderr, "usage: forge init [name] [--private]")
	127	fmt.Fprintln(os.Stderr, "usage: gitbay init [name] [--private]")
128	128	return protocol.ExitUsage
129	129	default:
130	130	name = a
		@@ -133,7 +133,7 @@ func cmdInit(args []string) int {
133	133	if name == "" {
134	134	wd, err := os.Getwd()
135	135	if err != nil {
136		fmt.Fprintln(os.Stderr, "forge:", err)
	136	fmt.Fprintln(os.Stderr, "gitbay:", err)
137	137	return protocol.ExitFailure
138	138	}
139	139	name = filepath.Base(wd)
		@@ -141,12 +141,12 @@ func cmdInit(args []string) int {
141	141
142	142	cfg, err := cliconfig.Load()
143	143	if err != nil {
144		fmt.Fprintln(os.Stderr, "forge:", err)
	144	fmt.Fprintln(os.Stderr, "gitbay:", err)
145	145	return protocol.ExitFailure
146	146	}
147	147	inst, _, err := cfg.DefaultInstance()
148	148	if err != nil {
149		fmt.Fprintln(os.Stderr, "forge:", err)
	149	fmt.Fprintln(os.Stderr, "gitbay:", err)
150	150	return protocol.ExitFailure
151	151	}
152	152	t := target{inst: inst}
		@@ -196,7 +196,7 @@ func captureSSH(t target, serverArgv []string) (string, int) {
196	196	if ee, ok := err.(*exec.ExitError); ok {
197	197	return "", ee.ExitCode()
198	198	}
199		fmt.Fprintln(os.Stderr, "forge: running ssh:", err)
	199	fmt.Fprintln(os.Stderr, "gitbay: running ssh:", err)
200	200	return "", protocol.ExitProtocol
201	201	}
202	202	return string(out), 0
		@@ -210,7 +210,7 @@ func quoteAll(args []string) []string {
210	210	return out
211	211	}
212	212
213		// cmdRemoteAdd implements `forge remote add <name> <host> [flags]`.
	213	// cmdRemoteAdd implements `gitbay remote add <name> <host> [flags]`.
214	214	func cmdRemoteAdd(args []string) int {
215	215	var name, host, user string
216	216	var port int
		@@ -250,19 +250,19 @@ func cmdRemoteAdd(args []string) int {
250	250	} else if host == "" {
251	251	host = a
252	252	} else {
253		fmt.Fprintln(os.Stderr, "usage: forge remote add <name> <host> [--port n] [--user u] [--ssh-option opt]... [--default]")
	253	fmt.Fprintln(os.Stderr, "usage: gitbay remote add <name> <host> [--port n] [--user u] [--ssh-option opt]... [--default]")
254	254	return protocol.ExitUsage
255	255	}
256	256	i++
257	257	}
258	258	}
259	259	if name == "" \|\| host == "" {
260		fmt.Fprintln(os.Stderr, "usage: forge remote add <name> <host> [--port n] [--user u] [--ssh-option opt]... [--default]")
	260	fmt.Fprintln(os.Stderr, "usage: gitbay remote add <name> <host> [--port n] [--user u] [--ssh-option opt]... [--default]")
261	261	return protocol.ExitUsage
262	262	}
263	263	cfg, err := cliconfig.Load()
264	264	if err != nil {
265		fmt.Fprintln(os.Stderr, "forge:", err)
	265	fmt.Fprintln(os.Stderr, "gitbay:", err)
266	266	return protocol.ExitFailure
267	267	}
268	268	cfg.Instances[name] = cliconfig.Instance{Host: host, Port: port, User: user, SSHOptions: sshOptions}
		@@ -270,7 +270,7 @@ func cmdRemoteAdd(args []string) int {
270	270	cfg.Default = name
271	271	}
272	272	if err := cliconfig.Save(cfg); err != nil {
273		fmt.Fprintln(os.Stderr, "forge:", err)
	273	fmt.Fprintln(os.Stderr, "gitbay:", err)
274	274	return protocol.ExitFailure
275	275	}
276	276	fmt.Printf("added instance %s (%s)\n", name, host)
		@@ -280,7 +280,7 @@ func cmdRemoteAdd(args []string) int {
280	280	func cmdRemoteList() int {
281	281	cfg, err := cliconfig.Load()
282	282	if err != nil {
283		fmt.Fprintln(os.Stderr, "forge:", err)
	283	fmt.Fprintln(os.Stderr, "gitbay:", err)
284	284	return protocol.ExitFailure
285	285	}
286	286	for name, inst := range cfg.Instances {

cmd/forge/main.go → cmd/gitbay/main.go renamed +12 −12

		@@ -13,12 +13,12 @@ import (
13	13	"github.com/spf13/cobra"
14	14	"github.com/spf13/cobra/doc"
15	15
16		"github.com/krazywarez/forge/internal/protocol"
	16	"gitbay.org/gitbay/internal/protocol"
17	17	)
18	18
19	19	func main() {
20	20	root := &cobra.Command{
21		Use: "forge",
	21	Use: "gitbay",
22	22	Short: "CLI-first git forge client",
23	23	SilenceUsage: true,
24	24	SilenceErrors: true,
		@@ -36,7 +36,7 @@ func main() {
36	36	)
37	37
38	38	if err := root.Execute(); err != nil {
39		fmt.Fprintln(os.Stderr, "forge:", err)
	39	fmt.Fprintln(os.Stderr, "gitbay:", err)
40	40	os.Exit(protocol.ExitUsage)
41	41	}
42	42	}
		@@ -72,13 +72,13 @@ func pass(use, short string, o passOpts) *cobra.Command {
72	72	func runPass(o passOpts, args []string) int {
73	73	t, err := resolveTarget()
74	74	if err != nil {
75		fmt.Fprintln(os.Stderr, "forge:", err)
	75	fmt.Fprintln(os.Stderr, "gitbay:", err)
76	76	return protocol.ExitFailure
77	77	}
78	78	if o.needsRepo {
79	79	args, err = withRepo(t, args)
80	80	if err != nil {
81		fmt.Fprintln(os.Stderr, "forge:", err)
	81	fmt.Fprintln(os.Stderr, "gitbay:", err)
82	82	return protocol.ExitUsage
83	83	}
84	84	}
		@@ -87,7 +87,7 @@ func runPass(o passOpts, args []string) int {
87	87	if o.editor != "" {
88	88	extended, body, ok, err := maybeEditor(args, o.editor)
89	89	if err != nil {
90		fmt.Fprintln(os.Stderr, "forge:", err)
	90	fmt.Fprintln(os.Stderr, "gitbay:", err)
91	91	return protocol.ExitFailure
92	92	}
93	93	if !ok {
		@@ -186,14 +186,14 @@ func authCmd() *cobra.Command {
186	186
187	187	func repoCmd() *cobra.Command {
188	188	return group("repo", "create and manage repositories",
189		pass("create", "create a repository: forge repo create <owner/name> [--private]",
	189	pass("create", "create a repository: gitbay repo create <owner/name> [--private]",
190	190	passOpts{server: []string{"repo", "create"}}),
191	191	pass("list", "list repositories you own or can access", passOpts{server: []string{"repo", "list"}}),
192	192	pass("show", "show repository details", passOpts{server: []string{"repo", "show"}, needsRepo: true}),
193	193	pass("log", "commit log with signature states", passOpts{server: []string{"repo", "log"}, needsRepo: true}),
194	194	pass("delete", "delete a repository (--yes)", passOpts{server: []string{"repo", "delete"}, needsRepo: true}),
195	195	pass("fork", "fork a repository under your account", passOpts{server: []string{"repo", "fork"}, needsRepo: true}),
196		local("clone", "clone via ssh: forge repo clone <owner/name> [dir]", cmdRepoClone),
	196	local("clone", "clone via ssh: gitbay repo clone <owner/name> [dir]", cmdRepoClone),
197	197	importCmd(),
198	198	group("access", "manage access grants",
199	199	pass("grant", "grant access: ... <user> read\|write\|admin", passOpts{server: []string{"repo", "access", "grant"}, needsRepo: true}),
		@@ -232,7 +232,7 @@ func mrCmd() *cobra.Command {
232	232	pass("list", "list merge requests [--state ...]", passOpts{server: []string{"mr", "list"}, needsRepo: true}),
233	233	pass("show", "show a merge request", passOpts{server: []string{"mr", "show"}, needsRepo: true}),
234	234	pass("diff", "show the diff", passOpts{server: []string{"mr", "diff"}, needsRepo: true}),
235		local("checkout", "fetch and check out the MR head locally: forge mr checkout <n>", cmdMRCheckout),
	235	local("checkout", "fetch and check out the MR head locally: gitbay mr checkout <n>", cmdMRCheckout),
236	236	pass("comment", "comment on a merge request", passOpts{server: []string{"mr", "comment"}, needsRepo: true, stdinOK: true, editor: "comment"}),
237	237	pass("review", "review: --approve\|--request-changes\|--comment", passOpts{server: []string{"mr", "review"}, needsRepo: true}),
238	238	pass("merge", "merge (fast-forward or merge-commit): [--strategy ff\|merge]", passOpts{server: []string{"mr", "merge"}, needsRepo: true}),
		@@ -244,7 +244,7 @@ func mrCmd() *cobra.Command {
244	244	func importCmd() *cobra.Command {
245	245	return &cobra.Command{
246	246	Use: "import",
247		Short: "server-side mirror of a foreign repo: forge repo import <owner/name> --from <url> [--private] [--token-stdin]",
	247	Short: "server-side mirror of a foreign repo: gitbay repo import <owner/name> --from <url> [--private] [--token-stdin]",
248	248	DisableFlagParsing: true,
249	249	RunE: func(cmd *cobra.Command, args []string) error {
250	250	for _, a := range args {
		@@ -283,14 +283,14 @@ func webCmd() *cobra.Command {
283	283
284	284	func remoteCmd() *cobra.Command {
285	285	return group("remote", "local instance profiles (no server contact)",
286		local("add", "add a named forge instance: forge remote add <name> <host> [--port n] [--user u] [--ssh-option o]... [--default]",
	286	local("add", "add a named gitbay instance: gitbay remote add <name> <host> [--port n] [--user u] [--ssh-option o]... [--default]",
287	287	cmdRemoteAdd),
288	288	local("list", "list configured instances", func([]string) int { return cmdRemoteList() }),
289	289	)
290	290	}
291	291
292	292	func initCmd() *cobra.Command {
293		return local("init", "git init + repo create + set origin, in one step: forge init [name] [--private]", cmdInit)
	293	return local("init", "git init + repo create + set origin, in one step: gitbay init [name] [--private]", cmdInit)
294	294	}
295	295
296	296	// manCmd generates man pages; a CLI-first tool without man pages is not

cmd/forge/ssh.go → cmd/gitbay/ssh.go renamed +4 −4

		@@ -9,8 +9,8 @@ import (
9	9	"strconv"
10	10	"strings"
11	11
12		"github.com/krazywarez/forge/internal/cliconfig"
13		"github.com/krazywarez/forge/internal/protocol"
	12	"gitbay.org/gitbay/internal/cliconfig"
	13	"gitbay.org/gitbay/internal/protocol"
14	14	)
15	15
16	16	// context is the resolved target for a command: which instance to talk to
		@@ -105,7 +105,7 @@ func runSSH(t target, serverArgv []string, stdin io.Reader) int {
105	105	}
106	106	return code
107	107	}
108		fmt.Fprintln(os.Stderr, "forge: running ssh:", err)
	108	fmt.Fprintln(os.Stderr, "gitbay: running ssh:", err)
109	109	return protocol.ExitProtocol
110	110	}
111	111
		@@ -117,7 +117,7 @@ func withRepo(t target, args []string) ([]string, error) {
117	117	return args, nil // explicit owner/name
118	118	}
119	119	if t.repo == "" {
120		return nil, fmt.Errorf("no repository given and none inferable: pass <owner/name> or run inside a clone of a forge repository")
	120	return nil, fmt.Errorf("no repository given and none inferable: pass <owner/name> or run inside a clone of a gitbay repository")
121	121	}
122	122	return append([]string{t.repo}, args...), nil
123	123	}

cmd/forged/hook.go → cmd/gitbayd/hook.go renamed +5 −5

		@@ -10,9 +10,9 @@ import (
10	10
11	11	"github.com/spf13/cobra"
12	12
13		"github.com/krazywarez/forge/internal/gitutil"
14		"github.com/krazywarez/forge/internal/hookd"
15		"github.com/krazywarez/forge/internal/policy"
	13	"gitbay.org/gitbay/internal/gitutil"
	14	"gitbay.org/gitbay/internal/hookd"
	15	"gitbay.org/gitbay/internal/policy"
16	16	)
17	17
18	18	// collectIncomingCommits lists the commits this push introduces and reads
		@@ -58,7 +58,7 @@ func hookCmd() *cobra.Command {
58	58	repoID, err1 := strconv.ParseInt(os.Getenv(hookd.EnvRepoID), 10, 64)
59	59	userID, err2 := strconv.ParseInt(os.Getenv(hookd.EnvUserID), 10, 64)
60	60	if sock == "" \|\| err1 != nil \|\| err2 != nil {
61		return fmt.Errorf("missing FORGE_* environment; this command only runs as a git hook")
	61	return fmt.Errorf("missing GITBAY_* environment; this command only runs as a git hook")
62	62	}
63	63
64	64	var updates []policy.RefUpdate
		@@ -92,7 +92,7 @@ func hookCmd() *cobra.Command {
92	92	return collectIncomingCommits(updates)
93	93	})
94	94	if err != nil {
95		return fmt.Errorf("forge daemon unreachable: %w", err)
	95	return fmt.Errorf("gitbay daemon unreachable: %w", err)
96	96	}
97	97	if !resp.Allow {
98	98	fmt.Fprintln(os.Stderr, resp.Message)

cmd/forged/main.go → cmd/gitbayd/main.go renamed +15 −15

		@@ -1,4 +1,4 @@
1		// forged is the forge server daemon. The same binary also runs in hook mode
	1	// gitbayd is the forge server daemon. The same binary also runs in hook mode
2	2	// (invoked by git via core.hooksPath) and hosts the host-local admin commands.
3	3	package main
4	4
		@@ -14,18 +14,18 @@ import (
14	14	"github.com/spf13/cobra"
15	15	"golang.org/x/crypto/ssh"
16	16
17		"github.com/krazywarez/forge/internal/config"
18		"github.com/krazywarez/forge/internal/control"
19		"github.com/krazywarez/forge/internal/gitd"
20		"github.com/krazywarez/forge/internal/hookd"
21		"github.com/krazywarez/forge/internal/httpd"
22		"github.com/krazywarez/forge/internal/policy"
23		"github.com/krazywarez/forge/internal/sshd"
24		"github.com/krazywarez/forge/internal/store"
	17	"gitbay.org/gitbay/internal/config"
	18	"gitbay.org/gitbay/internal/control"
	19	"gitbay.org/gitbay/internal/gitd"
	20	"gitbay.org/gitbay/internal/hookd"
	21	"gitbay.org/gitbay/internal/httpd"
	22	"gitbay.org/gitbay/internal/policy"
	23	"gitbay.org/gitbay/internal/sshd"
	24	"gitbay.org/gitbay/internal/store"
25	25	)
26	26
27	27	func openStore(cfg config.Config) (*store.Store, error) {
28		s, err := store.Open(filepath.Join(cfg.Server.Root, "forge.db"))
	28	s, err := store.Open(filepath.Join(cfg.Server.Root, "gitbay.db"))
29	29	if err != nil {
30	30	return nil, err
31	31	}
		@@ -40,12 +40,12 @@ var configPath string
40	40
41	41	func main() {
42	42	root := &cobra.Command{
43		Use: "forged",
44		Short: "forge server daemon",
	43	Use: "gitbayd",
	44	Short: "gitbay server daemon",
45	45	SilenceUsage: true,
46	46	SilenceErrors: true,
47	47	}
48		root.PersistentFlags().StringVar(&configPath, "config", "/etc/forge/config.toml", "path to config file")
	48	root.PersistentFlags().StringVar(&configPath, "config", "/etc/gitbay/config.toml", "path to config file")
49	49
50	50	root.AddCommand(
51	51	checkConfigCmd(),
		@@ -58,7 +58,7 @@ func main() {
58	58	)
59	59
60	60	if err := root.Execute(); err != nil {
61		fmt.Fprintln(os.Stderr, "forged:", err)
	61	fmt.Fprintln(os.Stderr, "gitbayd:", err)
62	62	os.Exit(1)
63	63	}
64	64	}
		@@ -173,7 +173,7 @@ func migrateCmd() *cobra.Command {
173	173	if err != nil {
174	174	return err
175	175	}
176		s, err := store.Open(cfg.Server.Root + "/forge.db")
	176	s, err := store.Open(cfg.Server.Root + "/gitbay.db")
177	177	if err != nil {
178	178	return err
179	179	}

cmd/forged/system.go → cmd/gitbayd/system.go renamed +5 −5

		@@ -7,14 +7,14 @@ import (
7	7	"github.com/spf13/cobra"
8	8	"golang.org/x/crypto/ssh"
9	9
10		"github.com/krazywarez/forge/internal/config"
11		"github.com/krazywarez/forge/internal/protocol"
12		"github.com/krazywarez/forge/internal/sshd"
	10	"gitbay.org/gitbay/internal/config"
	11	"gitbay.org/gitbay/internal/protocol"
	12	"gitbay.org/gitbay/internal/sshd"
13	13	)
14	14
15	15	// authorizedKeysCmd backs sshd's AuthorizedKeysCommand in system mode:
16	16	//
17		// AuthorizedKeysCommand /usr/bin/forged --config /etc/forge/config.toml authorized-keys %t %k
	17	// AuthorizedKeysCommand /usr/bin/gitbayd --config /etc/gitbay/config.toml authorized-keys %t %k
18	18	// AuthorizedKeysCommandUser git
19	19	//
20	20	// It prints a forced-command authorized_keys line for registered keys and
		@@ -90,7 +90,7 @@ func shellCmd() *cobra.Command {
90	90
91	91	cmdline := os.Getenv("SSH_ORIGINAL_COMMAND")
92	92	if cmdline == "" {
93		fmt.Fprintf(os.Stderr, "forge control plane: interactive shells are not available.\nTry: ssh <host> help\n")
	93	fmt.Fprintf(os.Stderr, "gitbay control plane: interactive shells are not available.\nTry: ssh <host> help\n")
94	94	os.Exit(protocol.ExitUsage)
95	95	}
96	96	code := sshd.Exec(cfg, st, user, key.Scope, cmdline, os.Stdin, os.Stdout, os.Stderr)

e2e/cli_test.go +7 −7

		@@ -10,13 +10,13 @@ import (
10	10	"testing"
11	11	)
12	12
13		func buildForgeCLI(t *testing.T) string {
	13	func buildGitbayCLI(t *testing.T) string {
14	14	t.Helper()
15		bin := filepath.Join(t.TempDir(), "forge")
16		cmd := exec.Command("go", "build", "-o", bin, "github.com/krazywarez/forge/cmd/forge")
	15	bin := filepath.Join(t.TempDir(), "gitbay")
	16	cmd := exec.Command("go", "build", "-o", bin, "gitbay.org/gitbay/cmd/gitbay")
17	17	cmd.Dir = ".."
18	18	if out, err := cmd.CombinedOutput(); err != nil {
19		t.Fatalf("build forge: %v\n%s", err, out)
	19	t.Fatalf("build gitbay: %v\n%s", err, out)
20	20	}
21	21	return bin
22	22	}
		@@ -51,7 +51,7 @@ func (c cli) run(t testing.T, dir, stdin string, args ...string) (string, stri
51	51	if ee, ok := err.(*exec.ExitError); ok {
52	52	code = ee.ExitCode()
53	53	} else if err != nil {
54		t.Fatalf("forge %v: %v", args, err)
	54	t.Fatalf("gitbay %v: %v", args, err)
55	55	}
56	56	return out.String(), errOut.String(), code
57	57	}
		@@ -60,7 +60,7 @@ func (c cli) must(t testing.T, dir, stdin string, args ...string) string {
60	60	t.Helper()
61	61	out, errOut, code := c.run(t, dir, stdin, args...)
62	62	if code != 0 {
63		t.Fatalf("forge %v: exit %d\nstdout: %s\nstderr: %s", args, code, out, errOut)
	63	t.Fatalf("gitbay %v: exit %d\nstdout: %s\nstderr: %s", args, code, out, errOut)
64	64	}
65	65	return out
66	66	}
		@@ -72,7 +72,7 @@ func TestCLI(t *testing.T) {
72	72	"--key", aliceKey+".pub", "--email", "alice@example.test", "--verified")
73	73
74	74	c := &cli{
75		bin: buildForgeCLI(t),
	75	bin: buildGitbayCLI(t),
76	76	configDir: t.TempDir(),
77	77	inst: inst,
78	78	key: aliceKey,

e2e/http_test.go +1 −1

		@@ -90,7 +90,7 @@ func TestHTTPTransport(t *testing.T) {
90	90	}
91	91	if !strings.Contains(out, "remote error:") \|\|
92	92	!strings.Contains(out, "pushes to this forge go over SSH") \|\|
93		!strings.Contains(out, "git@forge.test:alice/pub.git") {
	93	!strings.Contains(out, "git@gitbay.test:alice/pub.git") {
94	94	t.Fatalf("[%s] push refusal output:\n%s", gitBin, out)
95	95	}
96	96	for _, banned := range []string{"Username", "Password", "Authentication failed", "terminal prompts disabled", "401", "403"} {

e2e/mr_test.go +1 −1

		@@ -9,7 +9,7 @@ import (
9	9
10	10	"golang.org/x/crypto/ssh"
11	11
12		"github.com/krazywarez/forge/internal/sig"
	12	"gitbay.org/gitbay/internal/sig"
13	13	)
14	14
15	15	type mrShow struct {

e2e/sig_test.go +2 −2

		@@ -16,7 +16,7 @@ import (
16	16	"github.com/ProtonMail/go-crypto/openpgp/packet"
17	17	"golang.org/x/crypto/ssh"
18	18
19		"github.com/krazywarez/forge/internal/sig"
	19	"gitbay.org/gitbay/internal/sig"
20	20	)
21	21
22	22	// --- fixture key helpers -------------------------------------------------
		@@ -361,7 +361,7 @@ func TestSignatureVerification(t *testing.T) {
361	361	vc.Dir = dir
362	362	vc.Env = gpgEnv
363	363	if out, err := vc.CombinedOutput(); err != nil {
364		t.Errorf("git verify-commit disagrees with forge verification: %v\n%s", err, out)
	364	t.Errorf("git verify-commit disagrees with gitbay verification: %v\n%s", err, out)
365	365	}
366	366	} else {
367	367	t.Log("gpg not installed; skipping git verify-commit cross-check")

e2e/ssh_test.go +13 −13

		@@ -1,4 +1,4 @@
1		// Package e2e drives a real forged with the real ssh and git clients.
	1	// Package e2e drives a real gitbayd with the real ssh and git clients.
2	2	package e2e
3	3
4	4	import (
		@@ -14,7 +14,7 @@ import (
14	14	)
15	15
16	16	type instance struct {
17		forged string // path to built binary
	17	gitbayd string // path to built binary
18	18	root string
19	19	config string
20	20	port int
		@@ -24,13 +24,13 @@ type instance struct {
24	24	sshDir string // per-user client keys live here
25	25	}
26	26
27		func buildForged(t *testing.T) string {
	27	func buildGitbayd(t *testing.T) string {
28	28	t.Helper()
29		bin := filepath.Join(t.TempDir(), "forged")
30		cmd := exec.Command("go", "build", "-o", bin, "github.com/krazywarez/forge/cmd/forged")
	29	bin := filepath.Join(t.TempDir(), "gitbayd")
	30	cmd := exec.Command("go", "build", "-o", bin, "gitbay.org/gitbay/cmd/gitbayd")
31	31	cmd.Dir = ".."
32	32	if out, err := cmd.CombinedOutput(); err != nil {
33		t.Fatalf("build forged: %v\n%s", err, out)
	33	t.Fatalf("build gitbayd: %v\n%s", err, out)
34	34	}
35	35	return bin
36	36	}
		@@ -53,7 +53,7 @@ func startInstance(t testing.T) instance {
53	53	func startInstanceWith(t testing.T, extra string) instance {
54	54	t.Helper()
55	55	inst := &instance{
56		forged: buildForged(t),
	56	gitbayd: buildGitbayd(t),
57	57	root: t.TempDir(),
58	58	port: freePort(t),
59	59	httpPort: freePort(t),
		@@ -64,7 +64,7 @@ func startInstanceWith(t testing.T, extra string) instance {
64	64	cfg := fmt.Sprintf(`
65	65	[server]
66	66	root = %q
67		site_url = "https://forge.test"
	67	site_url = "https://gitbay.test"
68	68	[ssh]
69	69	port = %d
70	70	[http]
		@@ -79,7 +79,7 @@ port = %d
79	79	t.Fatal(err)
80	80	}
81	81
82		inst.proc = exec.Command(inst.forged, "--config", inst.config, "serve")
	82	inst.proc = exec.Command(inst.gitbayd, "--config", inst.config, "serve")
83	83	inst.proc.Stderr = os.Stderr
84	84	if err := inst.proc.Start(); err != nil {
85	85	t.Fatal(err)
		@@ -98,19 +98,19 @@ port = %d
98	98	return inst
99	99	}
100	100	if time.Now().After(deadline) {
101		t.Fatal("forged did not start listening")
	101	t.Fatal("gitbayd did not start listening")
102	102	}
103	103	time.Sleep(50 * time.Millisecond)
104	104	}
105	105	}
106	106
107		// admin runs a forged admin command against the instance's database.
	107	// admin runs a gitbayd admin command against the instance's database.
108	108	func (i instance) admin(t testing.T, args ...string) string {
109	109	t.Helper()
110		cmd := exec.Command(i.forged, append([]string{"--config", i.config}, args...)...)
	110	cmd := exec.Command(i.gitbayd, append([]string{"--config", i.config}, args...)...)
111	111	out, err := cmd.CombinedOutput()
112	112	if err != nil {
113		t.Fatalf("forged %v: %v\n%s", args, err, out)
	113	t.Fatalf("gitbayd %v: %v\n%s", args, err, out)
114	114	}
115	115	return string(out)
116	116	}

e2e/system_test.go +4 −4

		@@ -24,14 +24,14 @@ func TestSystemSSHMode(t *testing.T) {
24	24	t.Fatal(err)
25	25	}
26	26
27		// forged in system mode: no embedded SSH listener; hookd + http still run.
	27	// gitbayd in system mode: no embedded SSH listener; hookd + http still run.
28	28	inst := startInstanceWith(t, "") // placeholder to reuse helpers; killed below
29	29	inst.proc.Process.Kill()
30	30	inst.proc.Wait()
31	31	cfg := fmt.Sprintf(`
32	32	[server]
33	33	root = %q
34		site_url = "https://forge.test"
	34	site_url = "https://gitbay.test"
35	35	[ssh]
36	36	mode = "system"
37	37	[http]
		@@ -41,7 +41,7 @@ tls = "off"
41	41	if err := os.WriteFile(inst.config, []byte(cfg), 0o600); err != nil {
42	42	t.Fatal(err)
43	43	}
44		inst.proc = exec.Command(inst.forged, "--config", inst.config, "serve")
	44	inst.proc = exec.Command(inst.gitbayd, "--config", inst.config, "serve")
45	45	inst.proc.Stderr = os.Stderr
46	46	if err := inst.proc.Start(); err != nil {
47	47	t.Fatal(err)
		@@ -65,7 +65,7 @@ tls = "off"
65	65	// wrapper script argument — only the command path is ownership-checked.
66	66	wrapper := filepath.Join(sshdDir, "akc.sh")
67	67	script := fmt.Sprintf("#!/bin/sh\nexec %q --config %q authorized-keys \"$1\" \"$2\"\n",
68		inst.forged, inst.config)
	68	inst.gitbayd, inst.config)
69	69	if err := os.WriteFile(wrapper, []byte(script), 0o755); err != nil {
70	70	t.Fatal(err)
71	71	}

e2e/web_test.go +1 −1

		@@ -12,7 +12,7 @@ import (
12	12
13	13	"golang.org/x/crypto/ssh"
14	14
15		"github.com/krazywarez/forge/internal/sig"
	15	"gitbay.org/gitbay/internal/sig"
16	16	)
17	17
18	18	func (i instance) get(t testing.T, path string) (int, string) {

go.mod +1 −1

		@@ -1,4 +1,4 @@
1		module github.com/krazywarez/forge
	1	module gitbay.org/gitbay
2	2
3	3	go 1.27.0
4	4

internal/cliconfig/cliconfig.go +3 −3

		@@ -46,10 +46,10 @@ type Config struct {
46	46
47	47	func Path() string {
48	48	if x := os.Getenv("XDG_CONFIG_HOME"); x != "" {
49		return filepath.Join(x, "forge", "config.toml")
	49	return filepath.Join(x, "gitbay", "config.toml")
50	50	}
51	51	home, _ := os.UserHomeDir()
52		return filepath.Join(home, ".config", "forge", "config.toml")
	52	return filepath.Join(home, ".config", "gitbay", "config.toml")
53	53	}
54	54
55	55	func Load() (Config, error) {
		@@ -95,7 +95,7 @@ func (c Config) DefaultInstance() (Instance, string, error) {
95	95	return inst, name, nil
96	96	}
97	97	}
98		return Instance{}, "", fmt.Errorf("no forge instance configured; run: forge remote add <name> <host>")
	98	return Instance{}, "", fmt.Errorf("no gitbay instance configured; run: gitbay remote add <name> <host>")
99	99	}
100	100
101	101	var (

internal/cliconfig/cliconfig_test.go +10 −10

		@@ -11,12 +11,12 @@ func TestParseRemoteURL(t *testing.T) {
11	11	repo string
12	12	ok bool
13	13	}{
14		{"ssh://git@forge.example/alice/proj.git", "forge.example", 0, "git", "alice/proj", true},
15		{"ssh://git@forge.example:2222/alice/proj.git", "forge.example", 2222, "git", "alice/proj", true},
16		{"ssh://forge.example/alice/proj", "forge.example", 0, "", "alice/proj", true},
17		{"git@forge.example:alice/proj.git", "forge.example", 0, "git", "alice/proj", true},
18		{"git@forge.example:alice/proj", "forge.example", 0, "git", "alice/proj", true},
19		{"https://forge.example/alice/proj.git", "", 0, "", "", false},
	14	{"ssh://git@gitbay.example/alice/proj.git", "gitbay.example", 0, "git", "alice/proj", true},
	15	{"ssh://git@gitbay.example:2222/alice/proj.git", "gitbay.example", 2222, "git", "alice/proj", true},
	16	{"ssh://gitbay.example/alice/proj", "gitbay.example", 0, "", "alice/proj", true},
	17	{"git@gitbay.example:alice/proj.git", "gitbay.example", 0, "git", "alice/proj", true},
	18	{"git@gitbay.example:alice/proj", "gitbay.example", 0, "git", "alice/proj", true},
	19	{"https://gitbay.example/alice/proj.git", "", 0, "", "", false},
20	20	{"/local/path/repo.git", "", 0, "", "", false},
21	21	}
22	22	for _, tc := range cases {
		@@ -35,12 +35,12 @@ func TestParseRemoteURL(t *testing.T) {
35	35	}
36	36
37	37	func TestCloneURL(t *testing.T) {
38		i := Instance{Host: "forge.example"}
39		if got := i.CloneURL("a/b"); got != "ssh://git@forge.example/a/b.git" {
	38	i := Instance{Host: "gitbay.example"}
	39	if got := i.CloneURL("a/b"); got != "ssh://git@gitbay.example/a/b.git" {
40	40	t.Errorf("CloneURL = %s", got)
41	41	}
42		i = Instance{Host: "forge.example", Port: 2222, User: "u"}
43		if got := i.CloneURL("a/b"); got != "ssh://u@forge.example:2222/a/b.git" {
	42	i = Instance{Host: "gitbay.example", Port: 2222, User: "u"}
	43	if got := i.CloneURL("a/b"); got != "ssh://u@gitbay.example:2222/a/b.git" {
44	44	t.Errorf("CloneURL = %s", got)
45	45	}
46	46	}

internal/config/config.go +3 −3

		@@ -1,4 +1,4 @@
1		// Package config loads and validates the forged server configuration.
	1	// Package config loads and validates the gitbayd server configuration.
2	2	package config
3	3
4	4	import (
		@@ -69,7 +69,7 @@ type Mail struct {
69	69	// Default returns the configuration used when a key is absent from the file.
70	70	func Default() Config {
71	71	return Config{
72		Server: Server{Root: "/var/lib/forge"},
	72	Server: Server{Root: "/var/lib/gitbay"},
73	73	SSH: SSH{Mode: "embedded", Port: 22},
74	74	HTTP: HTTP{Addr: ":443", TLS: "acme"},
75	75	Web: Web{Mode: "view_only"},
		@@ -154,7 +154,7 @@ func (c Config) Validate() error {
154	154	}
155	155	if c.Web.PasswordAuth && c.Web.Mode == "accounts" {
156	156	errs = append(errs, errors.New(
157		"web.password_auth is not implemented yet; browser sessions are minted over SSH (forge web login)"))
	157	"web.password_auth is not implemented yet; browser sessions are minted over SSH (gitbay web login)"))
158	158	}
159	159
160	160	return errors.Join(errs...)

internal/config/config_test.go +6 −6

		@@ -18,8 +18,8 @@ func writeConfig(t *testing.T, body string) string {
18	18
19	19	const minimal = `
20	20	[server]
21		root = "/var/lib/forge"
22		site_url = "https://forge.example"
	21	root = "/var/lib/gitbay"
	22	site_url = "https://gitbay.example"
23	23	`
24	24
25	25	func TestLoadMinimal(t *testing.T) {
		@@ -52,7 +52,7 @@ func TestContradictions(t *testing.T) {
52	52	},
53	53	{
54	54	"system ssh with open registration",
55		minimal + "\n[ssh]\nmode = \"system\"\n[registration]\nmode = \"open\"\n[mail]\nsmtp_host = \"mx.example\"\nfrom = \"forge@example\"\n",
	55	minimal + "\n[ssh]\nmode = \"system\"\n[registration]\nmode = \"open\"\n[mail]\nsmtp_host = \"mx.example\"\nfrom = \"gitbay@example\"\n",
56	56	"requires registration.mode = \"closed\"",
57	57	},
58	58	{
		@@ -72,12 +72,12 @@ func TestContradictions(t *testing.T) {
72	72	},
73	73	{
74	74	"unknown key",
75		"[server]\nroot = \"/var/lib/forge\"\nsite_url = \"https://forge.example\"\nbogus = 1\n",
	75	"[server]\nroot = \"/var/lib/gitbay\"\nsite_url = \"https://gitbay.example\"\nbogus = 1\n",
76	76	"unknown config key",
77	77	},
78	78	{
79	79	"missing site_url",
80		"[server]\nroot = \"/var/lib/forge\"\n",
	80	"[server]\nroot = \"/var/lib/gitbay\"\n",
81	81	"site_url",
82	82	},
83	83	}
		@@ -101,7 +101,7 @@ func TestValidCombinations(t *testing.T) {
101	101	}{
102	102	{
103	103	"invite with smtp",
104		minimal + "\n[registration]\nmode = \"invite\"\n[mail]\nsmtp_host = \"mx.example\"\nfrom = \"forge@example\"\n",
	104	minimal + "\n[registration]\nmode = \"invite\"\n[mail]\nsmtp_host = \"mx.example\"\nfrom = \"gitbay@example\"\n",
105	105	},
106	106	{
107	107	"system ssh closed registration",

internal/control/control.go +3 −3

		@@ -10,9 +10,9 @@ import (
10	10	"reflect"
11	11	"slices"
12	12
13		"github.com/krazywarez/forge/internal/config"
14		"github.com/krazywarez/forge/internal/protocol"
15		"github.com/krazywarez/forge/internal/store"
	13	"gitbay.org/gitbay/internal/config"
	14	"gitbay.org/gitbay/internal/protocol"
	15	"gitbay.org/gitbay/internal/store"
16	16	)
17	17
18	18	type Ctx struct {

internal/control/control_test.go +1 −1

		@@ -4,7 +4,7 @@ import (
4	4	"strings"
5	5	"testing"
6	6
7		"github.com/krazywarez/forge/internal/protocol"
	7	"gitbay.org/gitbay/internal/protocol"
8	8	)
9	9
10	10	// TestEveryCommandReachableFromBareSSH asserts that each registered command's

internal/control/identity.go +2 −2

		@@ -7,8 +7,8 @@ import (
7	7
8	8	"golang.org/x/crypto/ssh"
9	9
10		"github.com/krazywarez/forge/internal/protocol"
11		"github.com/krazywarez/forge/internal/store"
	10	"gitbay.org/gitbay/internal/protocol"
	11	"gitbay.org/gitbay/internal/store"
12	12	)
13	13
14	14	func init() {

internal/control/import.go +5 −5

		@@ -10,9 +10,9 @@ import (
10	10	"strings"
11	11	"time"
12	12
13		"github.com/krazywarez/forge/internal/gitutil"
14		"github.com/krazywarez/forge/internal/policy"
15		"github.com/krazywarez/forge/internal/protocol"
	13	"gitbay.org/gitbay/internal/gitutil"
	14	"gitbay.org/gitbay/internal/policy"
	15	"gitbay.org/gitbay/internal/protocol"
16	16	)
17	17
18	18	func init() {
		@@ -27,7 +27,7 @@ func init() {
27	27	const askpassScript = `#!/bin/sh
28	28	case "$1" in
29	29	Username*) echo "x-access-token" ;;
30		*) echo "${FORGE_IMPORT_TOKEN}" ;;
	30	*) echo "${GITBAY_IMPORT_TOKEN}" ;;
31	31	esac
32	32	`
33	33
		@@ -96,7 +96,7 @@ func runRepoImport(c *Ctx, args []string) int {
96	96	}
97	97	env = []string{
98	98	"GIT_ASKPASS=" + askpass,
99		"FORGE_IMPORT_TOKEN=" + token,
	99	"GITBAY_IMPORT_TOKEN=" + token,
100	100	"GIT_TERMINAL_PROMPT=0",
101	101	}
102	102	} else {

internal/control/issue.go +3 −3

		@@ -7,9 +7,9 @@ import (
7	7	"strconv"
8	8	"strings"
9	9
10		"github.com/krazywarez/forge/internal/policy"
11		"github.com/krazywarez/forge/internal/protocol"
12		"github.com/krazywarez/forge/internal/store"
	10	"gitbay.org/gitbay/internal/policy"
	11	"gitbay.org/gitbay/internal/protocol"
	12	"gitbay.org/gitbay/internal/store"
13	13	)
14	14
15	15	const maxBodyBytes = 64 << 10

internal/control/mr.go +4 −4

		@@ -7,10 +7,10 @@ import (
7	7	"strconv"
8	8	"strings"
9	9
10		"github.com/krazywarez/forge/internal/gitutil"
11		"github.com/krazywarez/forge/internal/policy"
12		"github.com/krazywarez/forge/internal/protocol"
13		"github.com/krazywarez/forge/internal/store"
	10	"gitbay.org/gitbay/internal/gitutil"
	11	"gitbay.org/gitbay/internal/policy"
	12	"gitbay.org/gitbay/internal/protocol"
	13	"gitbay.org/gitbay/internal/store"
14	14	)
15	15
16	16	func init() {

internal/control/repo.go +4 −4

		@@ -9,10 +9,10 @@ import (
9	9	"slices"
10	10	"strings"
11	11
12		"github.com/krazywarez/forge/internal/gitutil"
13		"github.com/krazywarez/forge/internal/policy"
14		"github.com/krazywarez/forge/internal/protocol"
15		"github.com/krazywarez/forge/internal/store"
	12	"gitbay.org/gitbay/internal/gitutil"
	13	"gitbay.org/gitbay/internal/policy"
	14	"gitbay.org/gitbay/internal/protocol"
	15	"gitbay.org/gitbay/internal/store"
16	16	)
17	17
18	18	// RepoDir returns the on-disk path for a repository.

internal/control/sig.go +5 −5

		@@ -8,11 +8,11 @@ import (
8	8	"strconv"
9	9	"time"
10	10
11		"github.com/krazywarez/forge/internal/gitutil"
12		"github.com/krazywarez/forge/internal/policy"
13		"github.com/krazywarez/forge/internal/protocol"
14		"github.com/krazywarez/forge/internal/sig"
15		"github.com/krazywarez/forge/internal/store"
	11	"gitbay.org/gitbay/internal/gitutil"
	12	"gitbay.org/gitbay/internal/policy"
	13	"gitbay.org/gitbay/internal/protocol"
	14	"gitbay.org/gitbay/internal/sig"
	15	"gitbay.org/gitbay/internal/store"
16	16	)
17	17
18	18	func init() {

internal/control/web.go +2 −2

		@@ -5,8 +5,8 @@ import (
5	5	"io"
6	6	"time"
7	7
8		"github.com/krazywarez/forge/internal/protocol"
9		"github.com/krazywarez/forge/internal/store"
	8	"gitbay.org/gitbay/internal/protocol"
	9	"gitbay.org/gitbay/internal/store"
10	10	)
11	11
12	12	func newStoredToken() (token, hash string, err error) { return store.NewToken() }

internal/gitd/gitd.go +3 −3

		@@ -13,9 +13,9 @@ import (
13	13	"strings"
14	14	"time"
15	15
16		"github.com/krazywarez/forge/internal/config"
17		"github.com/krazywarez/forge/internal/control"
18		"github.com/krazywarez/forge/internal/store"
	16	"gitbay.org/gitbay/internal/config"
	17	"gitbay.org/gitbay/internal/control"
	18	"gitbay.org/gitbay/internal/store"
19	19	)
20	20
21	21	type Server struct {

internal/gitutil/gitutil.go +1 −1

		@@ -31,7 +31,7 @@ func InitBare(path, defaultBranch, hooksPath string) error {
31	31
32	32	// Transport streams one git transport service (upload-pack, receive-pack,
33	33	// upload-archive). extraEnv entries are appended to the process environment;
34		// hooks read the FORGE_* variables from it.
	34	// hooks read the GITBAY_* variables from it.
35	35	func Transport(service, repoPath string, stdin io.Reader, stdout, errW io.Writer, extraEnv []string) error {
36	36	var args []string
37	37	switch service {

internal/gitutil/merge.go +1 −1

		@@ -137,7 +137,7 @@ func CommitFileChange(dir, branch, path string, content []byte, name, email, mes
137	137
138	138	// Stage the parent tree in a temporary index, splice the blob in, and
139	139	// write the new tree.
140		idx, err := os.CreateTemp("", "forge-index-*")
	140	idx, err := os.CreateTemp("", "gitbay-index-*")
141	141	if err != nil {
142	142	return "", err
143	143	}

internal/hookd/hookd.go +14 −14

		@@ -1,5 +1,5 @@
1	1	// Package hookd is the unix-socket bridge between git hooks and the daemon.
2		// The hook process (forged in hook mode) computes git facts — it inherits
	2	// The hook process (gitbayd in hook mode) computes git facts — it inherits
3	3	// git's quarantine environment, which the daemon does not see — and sends
4	4	// them here; the daemon answers with a policy decision.
5	5	//
		@@ -17,20 +17,20 @@ import (
17	17	"os"
18	18	"path/filepath"
19	19
20		"github.com/krazywarez/forge/internal/config"
21		"github.com/krazywarez/forge/internal/control"
22		"github.com/krazywarez/forge/internal/gitutil"
23		"github.com/krazywarez/forge/internal/policy"
24		"github.com/krazywarez/forge/internal/sig"
25		"github.com/krazywarez/forge/internal/store"
	20	"gitbay.org/gitbay/internal/config"
	21	"gitbay.org/gitbay/internal/control"
	22	"gitbay.org/gitbay/internal/gitutil"
	23	"gitbay.org/gitbay/internal/policy"
	24	"gitbay.org/gitbay/internal/sig"
	25	"gitbay.org/gitbay/internal/store"
26	26	)
27	27
28	28	// Env variable names passed to git transport subprocesses and inherited by
29	29	// hooks.
30	30	const (
31		EnvSocket = "FORGE_HOOK_SOCKET"
32		EnvRepoID = "FORGE_REPO_ID"
33		EnvUserID = "FORGE_USER_ID"
	31	EnvSocket = "GITBAY_HOOK_SOCKET"
	32	EnvRepoID = "GITBAY_REPO_ID"
	33	EnvUserID = "GITBAY_USER_ID"
34	34	)
35	35
36	36	type Request struct {
		@@ -59,7 +59,7 @@ type Response struct {
59	59	// SocketPath returns the hook socket location. It prefers the server root,
60	60	// but unix socket paths are capped (~104 bytes on macOS, 108 on Linux), so
61	61	// deep roots fall back to a hashed name under the system temp directory.
62		// Hooks receive the chosen path via FORGE_HOOK_SOCKET, so both sides always
	62	// Hooks receive the chosen path via GITBAY_HOOK_SOCKET, so both sides always
63	63	// agree.
64	64	func SocketPath(root string) string {
65	65	p := filepath.Join(root, "hook.sock")
		@@ -67,7 +67,7 @@ func SocketPath(root string) string {
67	67	return p
68	68	}
69	69	sum := sha256.Sum256([]byte(root))
70		return filepath.Join(os.TempDir(), fmt.Sprintf("forge-%x.sock", sum[:8]))
	70	return filepath.Join(os.TempDir(), fmt.Sprintf("gitbay-%x.sock", sum[:8]))
71	71	}
72	72
73	73	type Server struct {
		@@ -250,12 +250,12 @@ func Ask(socketPath string, req Request, commits func() (CommitsPayload, error))
250	250	// WriteHookScripts (re)generates the shared hooks directory. Called at
251	251	// daemon startup so a moved binary self-heals; every repo points here via
252	252	// core.hooksPath.
253		func WriteHookScripts(hooksDir, forgedPath string) error {
	253	func WriteHookScripts(hooksDir, gitbaydPath string) error {
254	254	if err := os.MkdirAll(hooksDir, 0o755); err != nil {
255	255	return err
256	256	}
257	257	for _, hook := range []string{"pre-receive", "post-receive"} {
258		script := fmt.Sprintf("#!/bin/sh\nexec %q hook %s\n", forgedPath, hook)
	258	script := fmt.Sprintf("#!/bin/sh\nexec %q hook %s\n", gitbaydPath, hook)
259	259	if err := os.WriteFile(filepath.Join(hooksDir, hook), []byte(script), 0o755); err != nil {
260	260	return err
261	261	}

internal/httpd/accounts.go +5 −5

		@@ -7,13 +7,13 @@ import (
7	7	"strings"
8	8	"time"
9	9
10		"github.com/krazywarez/forge/internal/control"
11		"github.com/krazywarez/forge/internal/gitutil"
12		"github.com/krazywarez/forge/internal/policy"
13		"github.com/krazywarez/forge/internal/store"
	10	"gitbay.org/gitbay/internal/control"
	11	"gitbay.org/gitbay/internal/gitutil"
	12	"gitbay.org/gitbay/internal/policy"
	13	"gitbay.org/gitbay/internal/store"
14	14	)
15	15
16		const sessionCookie = "forge_session"
	16	const sessionCookie = "gitbay_session"
17	17
18	18	// viewer returns the logged-in user, or a zero User for anonymous visitors.
19	19	// Only meaningful in accounts mode; in view_only no session route exists so

internal/httpd/routes_test.go +2 −2

		@@ -4,8 +4,8 @@ import (
4	4	"strings"
5	5	"testing"
6	6
7		"github.com/krazywarez/forge/internal/config"
8		"github.com/krazywarez/forge/internal/policy"
	7	"gitbay.org/gitbay/internal/config"
	8	"gitbay.org/gitbay/internal/policy"
9	9	)
10	10
11	11	// TestViewOnlyHasNoMutatingRoutes is the structural guarantee from the plan:

internal/httpd/smart.go +3 −3

		@@ -14,9 +14,9 @@ import (
14	14	"os/exec"
15	15	"strings"
16	16
17		"github.com/krazywarez/forge/internal/config"
18		"github.com/krazywarez/forge/internal/control"
19		"github.com/krazywarez/forge/internal/store"
	17	"gitbay.org/gitbay/internal/config"
	18	"gitbay.org/gitbay/internal/control"
	19	"gitbay.org/gitbay/internal/store"
20	20	)
21	21
22	22	type Server struct {

internal/httpd/web.go +6 −6

		@@ -4,7 +4,7 @@ import (
4	4	"bytes"
5	5	"fmt"
6	6
7		"github.com/krazywarez/forge/internal/policy"
	7	"gitbay.org/gitbay/internal/policy"
8	8	"html/template"
9	9	"net/http"
10	10	"path"
		@@ -17,11 +17,11 @@ import (
17	17	"github.com/alecthomas/chroma/v2/styles"
18	18	"github.com/yuin/goldmark"
19	19
20		"github.com/krazywarez/forge/internal/control"
21		"github.com/krazywarez/forge/internal/gitutil"
22		"github.com/krazywarez/forge/internal/sig"
23		"github.com/krazywarez/forge/internal/store"
24		"github.com/krazywarez/forge/internal/web"
	20	"gitbay.org/gitbay/internal/control"
	21	"gitbay.org/gitbay/internal/gitutil"
	22	"gitbay.org/gitbay/internal/sig"
	23	"gitbay.org/gitbay/internal/store"
	24	"gitbay.org/gitbay/internal/web"
25	25	)
26	26
27	27	const maxRenderBytes = 1 << 20 // largest blob rendered inline

internal/policy/access.go +1 −1

		@@ -3,7 +3,7 @@ package policy
3	3	import (
4	4	"strings"
5	5
6		"github.com/krazywarez/forge/internal/store"
	6	"gitbay.org/gitbay/internal/store"
7	7	)
8	8
9	9	// CanRead reports whether user may read repo over an authenticated channel.

internal/policy/access_test.go +1 −1

		@@ -3,7 +3,7 @@ package policy
3	3	import (
4	4	"testing"
5	5
6		"github.com/krazywarez/forge/internal/store"
	6	"gitbay.org/gitbay/internal/store"
7	7	)
8	8
9	9	var (

internal/sshd/sshd.go +10 −10

		@@ -17,13 +17,13 @@ import (
17	17
18	18	"golang.org/x/crypto/ssh"
19	19
20		"github.com/krazywarez/forge/internal/config"
21		"github.com/krazywarez/forge/internal/control"
22		"github.com/krazywarez/forge/internal/gitutil"
23		"github.com/krazywarez/forge/internal/hookd"
24		"github.com/krazywarez/forge/internal/policy"
25		"github.com/krazywarez/forge/internal/protocol"
26		"github.com/krazywarez/forge/internal/store"
	20	"gitbay.org/gitbay/internal/config"
	21	"gitbay.org/gitbay/internal/control"
	22	"gitbay.org/gitbay/internal/gitutil"
	23	"gitbay.org/gitbay/internal/hookd"
	24	"gitbay.org/gitbay/internal/policy"
	25	"gitbay.org/gitbay/internal/protocol"
	26	"gitbay.org/gitbay/internal/store"
27	27	)
28	28
29	29	type Server struct {
		@@ -37,7 +37,7 @@ func New(cfg config.Config, st store.Store) (Server, error) {
37	37
38	38	sc := &ssh.ServerConfig{
39	39	PublicKeyCallback: s.authenticate,
40		ServerVersion: "SSH-2.0-forged",
	40	ServerVersion: "SSH-2.0-gitbayd",
41	41	}
42	42	signers, err := loadHostKeys(cfg)
43	43	if err != nil {
		@@ -158,7 +158,7 @@ func (s Server) handleSession(sconn ssh.ServerConn, ch ssh.Channel, reqs <-cha
158	158	return
159	159	case "shell":
160	160	req.Reply(true, nil)
161		fmt.Fprintf(ch, "forge control plane: interactive shells are not available.\nTry: ssh %s help\n", s.cfg.Server.SiteURL)
	161	fmt.Fprintf(ch, "gitbay control plane: interactive shells are not available.\nTry: ssh %s help\n", s.cfg.Server.SiteURL)
162	162	sendExit(ch, protocol.ExitUsage)
163	163	return
164	164	case "pty-req", "env":
		@@ -190,7 +190,7 @@ func (s Server) runExec(sconn ssh.ServerConn, ch ssh.Channel, cmdline string)
190	190
191	191	// Exec runs one SSH exec command line for an authenticated key. It is the
192	192	// single dispatch path shared by the embedded listener and the system-sshd
193		// forced command (forged shell).
	193	// forced command (gitbayd shell).
194	194	func Exec(cfg config.Config, st *store.Store, user store.User, scope, cmdline string,
195	195	stdin io.Reader, stdout, stderr io.Writer) int {
196	196	argv, err := protocol.Tokenize(cmdline)

internal/store/signatures.go +1 −1

		@@ -5,7 +5,7 @@ import (
5	5	"errors"
6	6	"time"
7	7
8		"github.com/krazywarez/forge/internal/sig"
	8	"gitbay.org/gitbay/internal/sig"
9	9	)
10	10
11	11	// AddPGPKey registers an OpenPGP key and bumps the key epoch.

internal/store/store_test.go +1 −1

		@@ -8,7 +8,7 @@ import (
8	8
9	9	func open(t testing.T) Store {
10	10	t.Helper()
11		s, err := Open(filepath.Join(t.TempDir(), "forge.db"))
	11	s, err := Open(filepath.Join(t.TempDir(), "gitbay.db"))
12	12	if err != nil {
13	13	t.Fatal(err)
14	14	}

Commit 24c0aad9bf

Commit `24c0aad9bf`