diff options
| author | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-07-28 15:07:12 +0200 |
|---|---|---|
| committer | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-07-28 15:07:12 +0200 |
| commit | 310ac404f25b412c5c1ead12247b4eb36e9f0025 (patch) | |
| tree | 6e1dcc5e1f85a483cef7044d341b7c940c1690a8 /internal/web | |
| parent | 44472bbe31475a3c672ae003d928d7caffb4b50a (diff) | |
| parent | c5abf87fa7198c8f245f407774e2326e4b6c9b9c (diff) | |
| download | lectio-310ac404f25b412c5c1ead12247b4eb36e9f0025.tar.gz lectio-310ac404f25b412c5c1ead12247b4eb36e9f0025.zip | |
Merge branch 'engine-precedence-fixes': OF/EF calendar+readings flawlessness pass
Per-day validation vs litcal (OF) and missalemeum (EF) 2005-2050, all defects
fixed and re-validated to zero: OF calendar 0 real errors forward, OF readings
0 unresolvable, EF 0 reading gaps + resumed Sundays correct.
Diffstat (limited to 'internal/web')
| -rw-r--r-- | internal/web/server.go | 27 | ||||
| -rw-r--r-- | internal/web/server_test.go | 49 | ||||
| -rw-r--r-- | internal/web/static/base.css | 14 | ||||
| -rw-r--r-- | internal/web/templates/bookmarks.html | 2 | ||||
| -rw-r--r-- | internal/web/templates/index.html | 4 | ||||
| -rw-r--r-- | internal/web/templates/reader.html | 2 | ||||
| -rw-r--r-- | internal/web/templates/settings.html | 2 |
7 files changed, 100 insertions, 0 deletions
diff --git a/internal/web/server.go b/internal/web/server.go index 6e76d3f..92cb758 100644 --- a/internal/web/server.go +++ b/internal/web/server.go @@ -74,6 +74,7 @@ func NewServer(cfg config.Config) http.Handler { mux.HandleFunc("GET /calendar.ics", func(w http.ResponseWriter, r *http.Request) { calendarICSHandler(s.get())(w, r) }) mux.HandleFunc("GET /reader", func(w http.ResponseWriter, r *http.Request) { readerHandler(s.get(), s.table())(w, r) }) mux.HandleFunc("GET /theme.css", func(w http.ResponseWriter, r *http.Request) { themeCSSHandler(s.get())(w, r) }) + mux.HandleFunc("GET /source", sourceHandler) mux.HandleFunc("GET /settings", settingsGet(s)) mux.HandleFunc("POST /settings", settingsPost(s)) mux.HandleFunc("POST /reader/bookmark", addBookmark(s)) @@ -691,6 +692,32 @@ func themeCSSHandler(cfg config.Config) http.HandlerFunc { } } +// sourceHandler serves the AGPL-3.0 §13 source offer: where to obtain the +// code this server is running. Every page footer links here, so a user +// interacting with lectio-web over a network is never more than one click +// from the corresponding source. +// +// Deliberately dependency-free (no template, no config read): it must answer +// even when config is broken or a template failed to parse, because a §13 +// offer that only works on healthy days is not an offer. Plain text keeps it +// readable by both a browser and curl. +func sourceHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Header().Set("X-Content-Type-Options", "nosniff") + fmt.Fprintf(w, `lectio %s +Licence: %s (GNU Affero General Public License, version 3 or later) +Source: %s + +lectio is free software. You may use, study, share and modify it under the +terms of the AGPL. The full licence text ships with the source as LICENSE. + +Because this is the Affero GPL, section 13 applies to this server: if the +code running here has been MODIFIED, whoever operates it must offer you the +modified source. If this address does not lead to the version you are +talking to, that is the operator's obligation to fix, not lectio's. +`, config.Version, config.License, config.SourceURL) +} + // settingsData drives templates/settings.html. type settingsData struct { Cfg config.Config diff --git a/internal/web/server_test.go b/internal/web/server_test.go index 57286d5..42de0b5 100644 --- a/internal/web/server_test.go +++ b/internal/web/server_test.go @@ -630,3 +630,52 @@ func TestCalendarPDF(t *testing.T) { t.Errorf("not a pdf (len=%d)", len(b)) } } + +// TestSourceOffer covers the AGPL-3.0 §13 obligation: a user interacting with +// lectio-web over a network must be offered the corresponding source. That is +// a licence term, not a feature, so it is pinned here -- if someone later +// deletes the footer or the route, this fails rather than quietly putting the +// operator out of compliance. +func TestSourceOffer(t *testing.T) { + cfg := config.Default() + cfg.Offline = true // no network; the offer must not depend on readings + srv := NewServer(cfg) + + t.Run("/source names the licence and where to get the code", func(t *testing.T) { + rec := httptest.NewRecorder() + srv.ServeHTTP(rec, httptest.NewRequest("GET", "/source", nil)) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d, want 200", rec.Code) + } + if ct := rec.Header().Get("Content-Type"); !strings.HasPrefix(ct, "text/plain") { + t.Errorf("content-type = %q, want text/plain", ct) + } + body := rec.Body.String() + for _, want := range []string{config.SourceURL, config.License, config.Version} { + if !strings.Contains(body, want) { + t.Errorf("body missing %q:\n%s", want, body) + } + } + }) + + // Every page a user can actually land on carries the link. Fragments + // (htmx partials) are excluded -- they render inside a full page that + // already has it. + for _, path := range []string{ + "/?date=2026-07-22&v=wuj", + "/reader?v=wuj&book=John&chapter=1", + "/settings", + "/bookmarks", + } { + t.Run("footer on "+path, func(t *testing.T) { + rec := httptest.NewRecorder() + srv.ServeHTTP(rec, httptest.NewRequest("GET", path, nil)) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d, want 200", rec.Code) + } + if !strings.Contains(rec.Body.String(), `href="/source"`) { + t.Errorf("page has no source link (AGPL §13):\n%s", rec.Body.String()) + } + }) + } +} diff --git a/internal/web/static/base.css b/internal/web/static/base.css index d9d0e59..d367c15 100644 --- a/internal/web/static/base.css +++ b/internal/web/static/base.css @@ -296,3 +296,17 @@ a { /* Export links (download the readings). */ .export { font-family: var(--font-ui); font-size: 0.85rem; } .export a { margin: 0 0.15rem; } + +/* Licence footer: the AGPL-3.0 §13 source offer, on every full page. + * Quiet by design but never hidden -- §13 asks for a PROMINENT offer, so + * this must not be display:none'd or themed to invisibility. Colour (border + * and text) is the theme's, per this file's no-colour rule. */ +.licence { + max-width: var(--measure); + margin: var(--space-4) auto 0; + padding-top: var(--space-2); + border-top-width: 1px; + border-top-style: solid; + font-family: var(--font-ui); + font-size: 0.75rem; +} diff --git a/internal/web/templates/bookmarks.html b/internal/web/templates/bookmarks.html index efc988a..770c73a 100644 --- a/internal/web/templates/bookmarks.html +++ b/internal/web/templates/bookmarks.html @@ -46,5 +46,7 @@ {{end}} </div> + +<footer class="licence"><a href="/source">source</a> · AGPL-3.0-or-later</footer> </body> </html> diff --git a/internal/web/templates/index.html b/internal/web/templates/index.html index 762ed7b..b99725d 100644 --- a/internal/web/templates/index.html +++ b/internal/web/templates/index.html @@ -90,5 +90,9 @@ <div id="pane">{{.Reading}}</div> </div> + +{{/* AGPL-3.0 §13: the source offer must be visible to anyone using this + server over a network, so it sits on every full page, not just here. */}} +<footer class="licence"><a href="/source">source</a> · AGPL-3.0-or-later</footer> </body> </html> diff --git a/internal/web/templates/reader.html b/internal/web/templates/reader.html index ef144cc..36cc8a1 100644 --- a/internal/web/templates/reader.html +++ b/internal/web/templates/reader.html @@ -83,5 +83,7 @@ onchange="document.body.classList.toggle('mono', this.checked)"> {{.L.Mono}}</label> </div> + +<footer class="licence"><a href="/source">source</a> · AGPL-3.0-or-later</footer> </body> </html> diff --git a/internal/web/templates/settings.html b/internal/web/templates/settings.html index f4fae47..3ae2f41 100644 --- a/internal/web/templates/settings.html +++ b/internal/web/templates/settings.html @@ -104,5 +104,7 @@ </form> </div> + +<footer class="licence"><a href="/source">source</a> · AGPL-3.0-or-later</footer> </body> </html> |
