Commit `2f3a60f2e9`

2f3a60f2e906a6e466d35f0dc26021512142a1cf

parent: 97bab07d1a

Verified · cmc ci/build: success

cmc <hello@cleberg.net> · 2026-08-26 03:53 UTC

web: the login page names the host, not the display title

basePage carries both now: Site is the display name, Host is what a command
or URL must use. Setting [web] title made the login page print
"ssh git@GitBay web login".

Layout: unified · split

e2e/accounts_test.go +21

	@@ -217,3 +217,24 @@ func TestViewOnlyHasNoLoginOnTheWire(t *testing.T) {
217	t.Fatalf("web login in view_only: exit %d, %s", code, errOut)	217	t.Fatalf("web login in view_only: exit %d, %s", code, errOut)
218	}	218	}
219	}	219	}
		220
		221	// TestTitleIsNotAHostname pins the split between the instance's display name
		222	// and its hostname: the login page prints a command to paste into a terminal,
		223	// so it must name the host even when the operator has set a display title.
		224	func TestTitleIsNotAHostname(t *testing.T) {
		225	inst := startInstanceWith(t, "[web]\nmode = \"accounts\"\ntitle = \"GitBay\"\n")
		226
		227	status, body := inst.get(t, "/login")
		228	if status != 200 {
		229	t.Fatalf("/login = %d", status)
		230	}
		231	if strings.Contains(body, "ssh git@GitBay") {
		232	t.Fatal("login page tells you to ssh to the display title")
		233	}
		234	if !strings.Contains(body, "ssh git@gitbay.test web login") {
		235	t.Fatalf("login page does not name the host:\n%s", body)
		236	}
		237	if !strings.Contains(body, "GitBay") {
		238	t.Fatal("login page dropped the display title entirely")
		239	}
		240	}

internal/httpd/accounts.go +4 −4

	@@ -66,7 +66,7 @@ func (s Server) login(w http.ResponseWriter, r http.Request) {
66	s.render(w, "login.html", struct {	66	s.render(w, "login.html", struct {
67	basePage	67	basePage
68	Error string	68	Error string
69	}{basePage{Site: s.siteName()}, ""})	69	}{basePage{Site: s.siteName(), Host: s.cfg.SiteHost()}, ""})
70	return	70	return
71	}	71	}
72	userID, err := s.st.ConsumeLoginToken(store.HashToken(token))	72	userID, err := s.st.ConsumeLoginToken(store.HashToken(token))
	@@ -74,7 +74,7 @@ func (s Server) login(w http.ResponseWriter, r http.Request) {
74	s.render(w, "login.html", struct {	74	s.render(w, "login.html", struct {
75	basePage	75	basePage
76	Error string	76	Error string
77	}{basePage{Site: s.siteName()},	77	}{basePage{Site: s.siteName(), Host: s.cfg.SiteHost()},
78	"that login link is invalid, expired, or already used — mint a new one"})	78	"that login link is invalid, expired, or already used — mint a new one"})
79	return	79	return
80	}	80	}
	@@ -226,7 +226,7 @@ func (s *Server) renderSignup(w http.ResponseWriter, errMsg, username string) {
226	Mode string // open \| invite	226	Mode string // open \| invite
227	Error string	227	Error string
228	Username string	228	Username string
229	}{basePage{Site: s.siteName()}, s.cfg.SiteHost(), s.cfg.Registration.Mode, errMsg, username})	229	}{basePage{Site: s.siteName(), Host: s.cfg.SiteHost()}, s.cfg.SiteHost(), s.cfg.Registration.Mode, errMsg, username})
230	}	230	}
231		231
232	func (s Server) signupSubmit(w http.ResponseWriter, r http.Request) {	232	func (s Server) signupSubmit(w http.ResponseWriter, r http.Request) {
	@@ -248,7 +248,7 @@ func (s Server) signupSubmit(w http.ResponseWriter, r http.Request) {
248	Username string	248	Username string
249	Message string	249	Message string
250	Host string	250	Host string
251	}{basePage{Site: s.siteName()}, username, msg, s.cfg.SiteHost()})	251	}{basePage{Site: s.siteName(), Host: s.cfg.SiteHost()}, username, msg, s.cfg.SiteHost()})
252	}	252	}
253		253
254	// issueCreateForm renders the new-issue form, prefilled from the repo's	254	// issueCreateForm renders the new-issue form, prefilled from the repo's

internal/httpd/page.go +5 −2

 // basePage is what the layout needs on every page, repo or not. Page
 // structs embed it so the rail and the site name are always in scope.
 type basePage struct {
+	// Site is the instance's display name; Host is the name a command or
+	// URL must use. Anything copy-pasteable takes Host.
 	Site   string
+	Host   string
 	Viewer string
 	Rail   rail
 }
 // resolved a viewer.
 func (s *Server) base(r *http.Request) basePage {
 	if s.cfg.Web.Mode != "accounts" {
-		return basePage{Site: s.siteName()}
+		return basePage{Site: s.siteName(), Host: s.cfg.SiteHost()}
 	}
 	return s.baseFor(s.viewer(r))
 }
 // baseFor is base for a handler that already holds the viewer, so the
 // session lookup is not repeated.
 func (s *Server) baseFor(viewer store.User) basePage {
-	b := basePage{Site: s.siteName()}
+	b := basePage{Site: s.siteName(), Host: s.cfg.SiteHost()}
 	if viewer.ID == 0 {
 		return b
 	}

internal/web/templates/login.html +1 −1

	@@ -4,6 +4,6 @@
4	{{if .Error}}<p class="error" role="alert">{{.Error}}</p>{{end}}	4	{{if .Error}}<p class="error" role="alert">{{.Error}}</p>{{end}}
5	<p>Browser sessions are minted over SSH — there is no password. From a machine	5	<p>Browser sessions are minted over SSH — there is no password. From a machine
6	with your registered key:</p>	6	with your registered key:</p>
7	<pre class="message">ssh git@{{.Site}} web login</pre>	7	<pre class="message">ssh git@{{.Host}} web login</pre>
8	<p>then open the printed URL within five minutes.</p>	8	<p>then open the printed URL within five minutes.</p>
9	{{end}}	9	{{end}}

Commit 2f3a60f2e9

Commit `2f3a60f2e9`