From 77498b62616db6413ab66928599490a824a16f42 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 30 Apr 2026 20:14:21 +0200 Subject: [PATCH] fix orphans --- internal/backend/db.go | 10 +++++----- internal/extra/injector.go | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/internal/backend/db.go b/internal/backend/db.go index 3739c15..5cb9861 100644 --- a/internal/backend/db.go +++ b/internal/backend/db.go @@ -102,7 +102,7 @@ func (b *DBBackend) initSchema(ctx context.Context) error { )`, `CREATE TABLE IF NOT EXISTS calendar_objects ( id SERIAL PRIMARY KEY, - calendar_id INTEGER REFERENCES calendars(id) ON DELETE CASCADE, + calendar_id INTEGER NOT NULL REFERENCES calendars(id) ON DELETE CASCADE, path TEXT NOT NULL, data TEXT NOT NULL, etag TEXT NOT NULL, @@ -110,20 +110,20 @@ func (b *DBBackend) initSchema(ctx context.Context) error { )`, `CREATE TABLE IF NOT EXISTS addressbooks ( id SERIAL PRIMARY KEY, - owner_id INTEGER REFERENCES users(id) ON DELETE CASCADE, + owner_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, path TEXT UNIQUE NOT NULL, name TEXT, description TEXT )`, `CREATE TABLE IF NOT EXISTS addressbook_access ( - addressbook_id INTEGER REFERENCES addressbooks(id) ON DELETE CASCADE, - user_id INTEGER REFERENCES users(id) ON DELETE CASCADE, + addressbook_id INTEGER NOT NULL REFERENCES addressbooks(id) ON DELETE CASCADE, + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, mode TEXT NOT NULL, PRIMARY KEY (addressbook_id, user_id) )`, `CREATE TABLE IF NOT EXISTS addressbook_objects ( id SERIAL PRIMARY KEY, - addressbook_id INTEGER REFERENCES addressbooks(id) ON DELETE CASCADE, + addressbook_id INTEGER NOT NULL REFERENCES addressbooks(id) ON DELETE CASCADE, path TEXT NOT NULL, data TEXT NOT NULL, etag TEXT NOT NULL, diff --git a/internal/extra/injector.go b/internal/extra/injector.go index 280e2b8..df4aeaa 100644 --- a/internal/extra/injector.go +++ b/internal/extra/injector.go @@ -39,9 +39,19 @@ func InjectColor(r *http.Request, ctx context.Context, handler http.Handler, w h body := buf.Bytes() // this models after the Radicale Response, largely AI code - // 1. Add namespaces to the root multistatus tag - reMultistatus := regexp.MustCompile(`(<[a-zA-Z0-9]*:?multistatus)`) - body = reMultistatus.ReplaceAll(body, []byte(`$1 xmlns:ICAL="http://apple.com/ns/ical/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/"`)) + // 1. Add namespaces to the root multistatus tag only if they are missing + if !bytes.Contains(body, []byte("xmlns:ICAL=")) { + reMultistatus := regexp.MustCompile(`(<[a-zA-Z0-9]*:?multistatus)`) + body = reMultistatus.ReplaceAll(body, []byte(`$1 xmlns:ICAL="http://apple.com/ns/ical/"`)) + } + if !bytes.Contains(body, []byte("xmlns:C=")) && !bytes.Contains(body, []byte("xmlns:c=")) { + reMultistatus := regexp.MustCompile(`(<[a-zA-Z0-9]*:?multistatus)`) + body = reMultistatus.ReplaceAll(body, []byte(`$1 xmlns:C="urn:ietf:params:xml:ns:caldav"`)) + } + if !bytes.Contains(body, []byte("xmlns:CS=")) { + reMultistatus := regexp.MustCompile(`(<[a-zA-Z0-9]*:?multistatus)`) + body = reMultistatus.ReplaceAll(body, []byte(`$1 xmlns:CS="http://calendarserver.org/ns/"`)) + } // 2. Response processing reResponse := regexp.MustCompile(`(?s)<[a-zA-Z0-9]*:?response.*?>.*?`) @@ -62,7 +72,7 @@ func InjectColor(r *http.Request, ctx context.Context, handler http.Handler, w h return resp } - // 1. Strip any existing conflicting tags that might be in 404 blocks + // 1. Strip any existing conflicting tags that might be in 404 blocks (non-greedy) reStrip := regexp.MustCompile(`(?s)<[a-zA-Z0-9]*:?(calendar-color|getctag|calendar-order).*?/>|<[a-zA-Z0-9]*:?(calendar-color|getctag|calendar-order).*?>.*?`) resp = reStrip.ReplaceAll(resp, []byte(""))